Merge pull request #8 from signifyd/MAG-578

MAG-578: Fix to improve fulfillment compatibility
signifyd · Sep 2, 2020 · 4572648 · 4572648
2 parents c690a6d + 9234ab4
commit 4572648
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/www/magento/app/code/community/Signifyd/Connect/Helper/Data.php b/www/magento/app/code/community/Signifyd/Connect/Helper/Data.php
@@ -1377,10 +1377,10 @@ public function getTrackingNumbers(Mage_Sales_Model_Order_Shipment $shipment)
 
         /** @var Mage_Sales_Model_Order_Shipment_Track $tracking */
         foreach ($trackingCollection->getItems() as $tracking) {
-            $number = trim($tracking->getNumber());
+            $number = trim((string) $tracking->getNumber());
 
             if (empty($number) == false) {
-                $trackingNumbers[] = $tracking->getNumber();
+                $trackingNumbers[] = $number;
             }
         }
 

diff --git a/www/magento/app/code/community/Signifyd/Connect/etc/config.xml b/www/magento/app/code/community/Signifyd/Connect/etc/config.xml
@@ -186,6 +186,16 @@
                     </signifyd_connect>
                 </observers>
             </order_cancel_after>
+
+            <!-- Fulfilment events -->
+            <sales_order_shipment_track_save_commit_after>
+                <observers>
+                    <signifyd_connect>
+                        <model>signifyd_connect/observer</model>
+                        <method>salesOrderShipmentTrackSaveCommitAfter</method>
+                    </signifyd_connect>
+                </observers>
+            </sales_order_shipment_track_save_commit_after>
         </events>
     </global>
     <crontab>
@@ -294,15 +304,6 @@
                     </signifyd_connect>
                 </observers>
             </core_block_abstract_to_html_before>
-            <!-- Fulfilment events -->
-            <sales_order_shipment_track_save_commit_after>
-                <observers>
-                    <signifyd_connect>
-                        <model>signifyd_connect/observer</model>
-                        <method>salesOrderShipmentTrackSaveCommitAfter</method>
-                    </signifyd_connect>
-                </observers>
-            </sales_order_shipment_track_save_commit_after>
         </events>
     </adminhtml>
     <default>