Merge branch 'MAGETWO-34653' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into MAGETWO-34653

Author: sivaschenko

app/code/Magento/Shipping/composer.json

@@ -14,7 +14,6 @@
         "magento/module-tax": "0.74.0-beta2",
         "magento/module-catalog-inventory": "0.74.0-beta2",
         "magento/module-quote": "0.74.0-beta2",
-        "magento/module-ui": "0.74.0-beta2",
         "magento/framework": "0.74.0-beta2",
         "ext-gd": "*",
         "magento/magento-composer-installer": "*"

app/code/Magento/Shipping/view/adminhtml/templates/create/form.phtml

@@ -56,35 +56,9 @@
 <script>
 require([
     "jquery",
-    "Magento_Ui/js/lib/registry/registry",
     "mage/mage",
     "prototype"
-], function(jQuery, registry){
-
-    registry.get('packaging', function(packaging){
-        packaging.setConfirmPackagingCallback(function(){
-            packaging.setParamsCreateLabelRequest($('edit_form').serialize(true));
-            packaging.sendCreateLabelRequest();
-        });
-        packaging.setLabelCreatedCallback(function(response){
-            setLocation("<?php echo $block->getUrl(
-                'sales/order/view',
-                ['order_id' => $block->getShipment()->getOrderId()]
-            ); ?>");
-        });
-        packaging.setCancelCallback(function() {
-            packaging.cleanPackages();
-            $('create_shipping_label').checked = false;
-            toggleCreateLabelCheckbox();
-        });
-        packaging.setItemQtyCallback(function(itemId){
-            var item = $$('[name="shipment[items]['+itemId+']"]')[0];
-            if (item && !isNaN(item.value)) {
-                return item.value;
-            }
-        });
-    });
-
+], function(jQuery){
     jQuery('#edit_form').mage('form').mage('validation');
 
 });

app/code/Magento/Shipping/view/adminhtml/templates/order/packaging/popup.phtml

@@ -16,19 +16,37 @@ $girthEnabled = $block->isDisplayGirthValue() && $block->isGirthAllowed() ? 1 :
 <script>
 require([
     "jquery",
-    "Magento_Ui/js/lib/registry/registry",
     "prototype",
     "Magento_Shipping/order/packaging"
-], function(jQuery, registry){
+], function(jQuery){
 
     packaging = new Packaging(<?php echo $block->getConfigDataJson() ?>);
     packaging.changeContainerType($$('select[name=package_container]')[0]);
     packaging.checkSizeAndGirthParameter(
             $$('select[name=package_container]')[0],
     <?php echo $girthEnabled; ?>
     );
-    registry.set('packaging', packaging);
-
+    packaging.setConfirmPackagingCallback(function(){
+        packaging.setParamsCreateLabelRequest($('edit_form').serialize(true));
+        packaging.sendCreateLabelRequest();
+    });
+    packaging.setLabelCreatedCallback(function(response){
+        setLocation("<?php echo $block->getUrl(
+                'sales/order/view',
+                ['order_id' => $block->getShipment()->getOrderId()]
+            ); ?>");
+    });
+    packaging.setCancelCallback(function() {
+        packaging.cleanPackages();
+        $('create_shipping_label').checked = false;
+        toggleCreateLabelCheckbox();
+    });
+    packaging.setItemQtyCallback(function(itemId){
+        var item = $$('[name="shipment[items]['+itemId+']"]')[0];
+        if (item && !isNaN(item.value)) {
+            return item.value;
+        }
+    });
 });
 </script>
 <div id="packaging_window" class="packaging-window" style="display:none;">