Merge branch 'dev-v2.1-master' into v2.1-master

mason · mason · commit 24070b279cdf · 2022-01-27T14:34:54.000+07:00
diff --git a/Observer/PWObserver.php b/Observer/PWObserver.php
@@ -24,17 +24,25 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $order = $observer->getEvent()->getOrder();
         $paymentMethod = $order->getPayment()->getMethod();
         if (($paymentMethod == self::PWLOCAL_METHOD
-                || $paymentMethod == self::BRICK) && $order->getState() == 'complete') {
+                || $paymentMethod == self::BRICK) && ($order->getState() == 'complete')) {
             if (!$this->_helper->getConfig('delivery_confirmation_api', $paymentMethod)) {
                 return;
             }
             $orderId = $order->getId();
 
+            $trackNumber = '';
+            $carrierName = '';
             if ($order->hasShipments()) {
                 $shipmentsCollection = $order->getShipmentsCollection();
                 $shipments = $shipmentsCollection->getItems();
                 $shipment = array_shift($shipments);
                 $shipmentCreatedAt = $shipment->getCreatedAt();
+                $tracksCollection = $shipment->getTracksCollection();
+
+                foreach ($tracksCollection->getItems() as $track) {
+                    $trackNumber = $track->getTrackNumber();
+                    $carrierName = $track->getTitle();
+                }
                 $shippingData = $shipment->getShippingAddress()->getData();
                 $prodtype = 'physical';
             } else {
@@ -79,6 +87,11 @@ public function execute(\Magento\Framework\Event\Observer $observer)
                 'is_test' => $this->_helper->getConfig('test_mode', $paymentMethod)
             ];
 
+            if ($prodtype == 'physical') {
+                $params['carrier_tracking_id'] = $trackNumber;
+                $params['carrier_type'] = $carrierName;
+            }
+
             $delivery = new \Paymentwall_GenerericApiObject('delivery');
             $response = $delivery->post($params);
             return $response;
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "paymentwall/module-magento2",
     "description": "Offical Paymentwall module for Magento 2",
-    "version": "2.3.1",
+    "version": "2.3.2",
     "type": "magento2-module",
     "homepage": "https://www.paymentwall.com/?source=gh",
     "keywords": [
diff --git a/etc/module.xml b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Paymentwall_Paymentwall" setup_version="2.3.1" schema_version="2.3.1">
+    <module name="Paymentwall_Paymentwall" setup_version="2.3.2" schema_version="2.3.2">
         <sequence>
             <module name="Magento_Sales"/>
             <module name="Magento_Payment"/>
diff --git a/view/frontend/templates/brick.phtml b/view/frontend/templates/brick.phtml
@@ -1,3 +1,4 @@
+
 <?php
 echo $block->getContainer();
 ?>
@@ -32,6 +33,7 @@ echo $block->getContainer();
                     values: setDefaultFormValues()
                 }
             }, 'default');
+            enableBrickPay()
             clearInterval(initBrick);
 
             // only show form if option is checked and no brick form was rendered
@@ -42,6 +44,49 @@ echo $block->getContainer();
         }
     }, 500);
 
+    let modifyBrick = setInterval(() => {
+        let brickControl = document.querySelector(".js-brick-step-form .brick-control")
+        if (brickControl) {
+            brickControl.style.position = "relative";
+            const shield = document.createElement('div');
+            shield.setAttribute("id", "brick-pay-shield")
+            let btnHeight = brickControl.querySelector("button").offsetHeight
+            let btnWidth = brickControl.querySelector("button").offsetWidth
+            let shieldStyle = "position: absolute;top: 0;left:0;display: block;z-index: 10000;cursor: pointer;height: " + btnHeight + "px;" + "width:" + btnWidth + "px;";
+            shield.setAttribute("style", shieldStyle)
+            brickControl.appendChild(shield)
+            document.getElementById("brick-pay-shield").addEventListener('click', function(e) {
+                parent.preValidateBrickCheckout()
+            });
+            clearInterval(modifyBrick)
+        }
+    }, 300)
+
+    let enableBrickPay = () => {
+        const btn = window.parent.document.getElementById('brick-place-order');
+        const options = {
+            attributes: true
+        }
+
+        function callbackDisableBrickButton(mutationList, observer) {
+            mutationList.forEach(function(mutation) {
+                if (mutation.type === 'attributes' && mutation.attributeName === 'class') {
+                    let shield = document.getElementById("brick-pay-shield");
+                    if (btn.classList.contains("disabled")) {
+                        shield.style.cursor = "not-allowed"
+                        shield.style.backgroundColor = "#ffffff87"
+                    } else {
+                        shield.style.cursor = "pointer"
+                        shield.style.backgroundColor = "transparent"
+                    }
+                }
+            })
+        }
+
+        let placeOrderObserver = new MutationObserver(callbackDisableBrickButton)
+        placeOrderObserver.observe(btn, options)
+    }
+
     function showBrickForm(brick) {
         brick.showPaymentForm((success) => {
             let result = {
@@ -55,7 +100,7 @@ echo $block->getContainer();
             parent.processBrickPlaceOrder(result)
 
         }, (errors) => {
-            // console.log(errors);
+
         });
     }
 
diff --git a/view/frontend/web/js/view/payment/brick_order.js b/view/frontend/web/js/view/payment/brick_order.js
@@ -3,3 +3,10 @@ window.processBrickPlaceOrder = function (paymentResult) {
     document.getElementById('brick-place-order').click();
 }
 
+window.preValidateBrickCheckout = function () {
+    // if place Order button is not disabled:
+    if (!document.getElementById('brick-place-order').classList.contains("disabled")) {
+        document.getElementById('brick-place-order').click();
+    }
+}
+
diff --git a/view/frontend/web/js/view/payment/method-renderer/brick1.6.js b/view/frontend/web/js/view/payment/method-renderer/brick1.6.js
@@ -6,13 +6,14 @@ define(
         'jquery',
         'Magento_Payment/js/view/payment/cc-form',
         'Magento_Payment/js/model/credit-card-validation/validator',
+        'Magento_Checkout/js/model/payment/additional-validators',
         'Magento_Checkout/js/model/customer-email-validator',
         'Magento_Payment/js/model/credit-card-validation/credit-card-number-validator/credit-card-type',
         'Magento_Checkout/js/model/quote',
         'Magento_Checkout/js/model/shipping-service',
         'brickOrderjs'
     ],
-    function (ko, $, Component, ccvalidator, customerEmailValidator, creditCardTypes, quote, shippingService, brickOrderjs ) {
+    function (ko, $, Component, ccvalidator, additionalValidators, customerEmailValidator, creditCardTypes, quote, shippingService, brickOrderjs ) {
 
         return Component.extend({
             defaults: {
@@ -31,6 +32,10 @@ define(
                 this.initBrick();
             },
 
+            validate: function () {
+                return true;
+            },
+
             initBrick: function() {
                 let initBrick = setInterval( () => {
                     let doc = $('#iframe-brick-container');
@@ -41,20 +46,37 @@ define(
                         clearInterval(initBrick);
                     }
                 }, 500);
+
+                quote.totals.subscribe(function (total) {
+                    $('#iframe-brick-container').attr('src', $('#iframe-brick-container').attr('src'));
+                }, this);
             },
 
             placeOrder: function (data, event) {
-                let chargeResult = window.brickCheckout
+                if (this.validate() &&
+                    additionalValidators.validate() &&
+                    ko.observable(quote.billingAddress()) != null
+                ) {
+                    let chargeResult = window.brickCheckout
 
-                this.card_type = chargeResult.card_type;
-                this.card_last_four = chargeResult.card_last_four;
-                this.brick_transaction_id = chargeResult.brick_transaction_id;
-                this.brick_risk = chargeResult.brick_risk;
-                this.is_under_review = chargeResult.is_under_review;
-                this.is_captured = chargeResult.is_captured;
+                    if (chargeResult) {
+                        this.card_type = chargeResult.card_type;
+                        this.card_last_four = chargeResult.card_last_four;
+                        this.brick_transaction_id = chargeResult.brick_transaction_id;
+                        this.brick_risk = chargeResult.brick_risk;
+                        this.is_under_review = chargeResult.is_under_review;
+                        this.is_captured = chargeResult.is_captured;
+                        this._super();
+                    }
 
-                var self = this;
-                this._super();
+                    if (chargeResult === undefined){
+                        let brickIframeContent = $("#iframe-brick-container").contents()
+                        brickIframeContent.find(".js-brick-submit").click()
+                    }
+
+                    return false;
+                }
+                return false;
             },
 
             styleTransactionSuccess()

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "paymentwall/module-magento2",`
`3`	`3`	`"description": "Offical Paymentwall module for Magento 2",`
`4`		`- "version": "2.3.1",`
	`4`	`+ "version": "2.3.2",`
`5`	`5`	`"type": "magento2-module",`
`6`	`6`	`"homepage": "https://www.paymentwall.com/?source=gh",`
`7`	`7`	`"keywords": [`