Adds Send to FlagShip button to order view

flagshipcompany · Jun 17, 2019 · 6c279ee · 6c279ee
1 parent 241b9db
commit 6c279ee
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/Plugin/SendToFlagshipButton.php b/Plugin/SendToFlagshipButton.php
@@ -4,11 +4,21 @@
 class SendToFlagshipButton{
 
     public function beforeSetLayout(\Magento\Shipping\Block\Adminhtml\Create $subject){
-
-        $this->order = $subject->getShipment()->getOrder();
-        if(!$this->order->hasShipments()){
-            $orderId = $this->order->getId();
-            $subject->addButton(
+
+        $this->addSendToFlagshipButton($subject);
+        return;
+    }
+
+    public function addSendToFlagshipButton($subject,$showButton = 1){
+        $order = NULL;
+        if(!is_null($subject->getShipment())){
+            $order = $subject->getShipment()->getOrder();
+        }
+        $order = $subject->getOrder();
+
+        if(!$order->hasShipments() && $showButton){
+            $orderId = $order->getId();
+            return $subject->addButton(
                 'send_to_flagship',
                 [
                     'label' => __('Send To FlagShip &#8618;'),
@@ -18,7 +28,7 @@ public function beforeSetLayout(\Magento\Shipping\Block\Adminhtml\Create $subjec
                 ]
             );
         }
-        return;
+        return NULL;
     }
 
 }
diff --git a/Plugin/UpdateTrackingDetails.php b/Plugin/UpdateTrackingDetails.php
@@ -5,10 +5,12 @@
 class UpdateTrackingDetails{
     public function __construct(
         \Flagship\Shipping\Plugin\HideCreateShippingLabel $tracking,
+        \Flagship\Shipping\Plugin\SendToFlagshipButton $sendToFlagshipButton,
         \Flagship\Shipping\Controller\Adminhtml\PrepareShipment\Index $prepareShipment
     ){
         $this->tracking = $tracking;
         $this->prepareShipment = $prepareShipment;
+        $this->sendToFlagshipButton = $sendToFlagshipButton;
     }
 
     public function beforeSetLayout(\Magento\Sales\Block\Adminhtml\Order\View $subject){
@@ -30,15 +32,8 @@ public function beforeSetLayout(\Magento\Sales\Block\Adminhtml\Order\View $subje
             return;
         }
 
-        $subject->addButton(
-                'send_to_flagship',
-                [
-                    'label' => __('Send To FlagShip &#8618;'),
-                    'class' => __('action action-secondary scalable'),
-                    'id' => 'send_to_flagship',
-                    'onclick' => sprintf("location.href = '%s';", $subject->getUrl('shipping/prepareShipment',['order_id' => $this->order->getId()]))
-                ]
-            );
+        $this->sendToFlagshipButton->addSendToFlagshipButton($subject);
+
         return;
     }