MAG1-97

Adjustments to allow order to be released from hold
signifyd · Dec 9, 2017 · f8c50b5 · f8c50b5
1 parent a002dc3
commit f8c50b5
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 26 deletions.
diff --git a/Controller/Adminhtml/Order/Unhold.php b/Controller/Adminhtml/Order/Unhold.php
@@ -20,32 +20,26 @@ class Unhold extends \Magento\Sales\Controller\Adminhtml\Order\Unhold
      */
     public function execute()
     {
-        $resultRedirect = parent::execute();
+        try {
+            $order = $this->orderRepository->get($this->getRequest()->getParam('order_id'));
+        } catch (NoSuchEntityException $e) {
+            return parent::execute();
+        }
 
-        /** @var \Magento\Sales\Model\Order $order */
-        $order = $this->_coreRegistry->registry('current_order');
-        $order->canUnhold();
+        /** @var $case \Signifyd\Connect\Model\Casedata */
+        $case = $this->_objectManager->get('Signifyd\Connect\Model\Casedata');
+        $case->load($order->getIncrementId());
 
-        if ($order->getStatus() != Order::STATE_HOLDED) {
-            $case = $this->getCase($order);
+        if (!$case->isHoldReleased()) {
+            $case->setEntries('hold_released', 1);
+            $case->save();
+        }
 
-            if (!$case->isHoldReleased()) {
-                $case->setEntries('hold_released', 1);
-                $case->save();
+        $resultRedirect = parent::execute();
 
-                $order->addStatusHistoryComment('Order released from hold by merchant');
-                $order->save();
-            }
-        }
+        $order->addStatusHistoryComment('Order released from hold by merchant');
+        $order->save();
 
         return $resultRedirect;
     }
-
-    public function getCase(Order $order)
-    {
-        /** @var $case \Signifyd\Connect\Model\Casedata */
-        $case = $this->_objectManager->get('Signifyd\Connect\Model\Casedata');
-        $case->load($order->getIncrementId());
-        return $case;
-    }
 }
diff --git a/Observer/Purchase.php b/Observer/Purchase.php
@@ -45,8 +45,7 @@ class Purchase implements ObserverInterface
 
     protected $specialMethods = ['payflow_express'];
 
-//    protected $restrictedMethods = ['checkmo', 'banktransfer', 'purchaseorder', 'cashondelivery'];
-    protected $restrictedMethods = ['banktransfer', 'purchaseorder', 'cashondelivery'];
+    protected $restrictedMethods = ['checkmo', 'banktransfer', 'purchaseorder', 'cashondelivery'];
 
     public function __construct(
         LogHelper $logger,

diff --git a/etc/crontab.xml b/etc/crontab.xml
@@ -2,7 +2,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
     <group id="default">
         <job name="cron_retry" instance="Signifyd\Connect\Cron\RetryCaseJob" method="execute">
-            <schedule>*/1 * * * *</schedule>
+            <schedule>*/15 * * * *</schedule>
         </job>
     </group>
 </config>
diff --git a/view/adminhtml/web/js/sales_order_view.js b/view/adminhtml/web/js/sales_order_view.js
@@ -32,8 +32,6 @@ define([
         var msg = $.mage.__('Signifyd has not reviewed this order, are you sure you want to unhold?'),
             url = $('#order-view-unhold-button').data('url');
 
-        console.log(url);
-
         confirm({
             'content': msg,
             'actions': {