Merge branch 'pw-master'

paymentwall · Mar 20, 2019 · 6c6b2af · 6c6b2af
2 parents d62620f + 422e3f8
commit 6c6b2af
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/src/app/code/community/Paymentwall/Paymentwall/Model/Method/Abstract.php b/src/app/code/community/Paymentwall/Paymentwall/Model/Method/Abstract.php
@@ -104,9 +104,8 @@ public function callDeliveryApi($ref) {
      */
     private function prepareDeliveryData(Mage_Sales_Model_Order $order, $ref) {
         $billing = $order->getBillingAddress();
-        $shipping = $order->getShippingAddress();
 
-        return array(
+        $data = array(
             'payment_id' => $ref,
             'type' => 'digital',
             'status' => 'delivered',
@@ -115,17 +114,28 @@ private function prepareDeliveryData(Mage_Sales_Model_Order $order, $ref) {
             'refundable' => 'yes',
             'details' => 'Item will be delivered via email by ' . date('Y/m/d H:i:s'),
             'shipping_address[email]' => $billing->getEmail(),
-            'shipping_address[firstname]' => $shipping->getFirstname(),
-            'shipping_address[lastname]' => $shipping->getLastname(),
-            'shipping_address[country]' => $shipping->getCountry(),
-            'shipping_address[street]' => $shipping->getStreetFull(),
-            'shipping_address[state]' => $shipping->getRegion(),
-            'shipping_address[phone]' => $shipping->getTelephone(),
-            'shipping_address[zip]' => $shipping->getPostcode(),
-            'shipping_address[city]' => $shipping->getCity(),
+
             'reason' => 'none',
             'is_test' => $this->getConfigData('paymentwall_istest') ? 1 : 0,
         );
+
+        $shipping = $order->getShippingAddress();
+
+        if (!empty($shipping)) {
+            $data['type'] = 'physical';
+            $data = array_merge($data, array(
+                'shipping_address[firstname]' => $shipping->getFirstname(),
+                'shipping_address[lastname]' => $shipping->getLastname(),
+                'shipping_address[country]' => $shipping->getCountry(),
+                'shipping_address[street]' => $shipping->getStreetFull(),
+                'shipping_address[state]' => $shipping->getRegion(),
+                'shipping_address[phone]' => $shipping->getTelephone(),
+                'shipping_address[zip]' => $shipping->getPostcode(),
+                'shipping_address[city]' => $shipping->getCity(),
+            ));
+        }
+
+        return $data;
     }
 
     /**

diff --git a/src/app/code/community/Paymentwall/Paymentwall/Model/Pingback.php b/src/app/code/community/Paymentwall/Paymentwall/Model/Pingback.php
@@ -32,7 +32,7 @@ public function handlePingback()
             Mage::getModel('paymentwall/method_pwlocal')->initPaymentwallConfig();
         }
 
-        if ($pingback->validate()) {
+        if ($pingback->validate(true)) {
 
             if ($this->isRecurring($pingback)) {
                 return $this->processPingbackRecurringProfile($pingback);

diff --git a/src/app/code/community/Paymentwall/Paymentwall/etc/config.xml b/src/app/code/community/Paymentwall/Paymentwall/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Paymentwall_Paymentwall>
-            <version>1.2.8</version>
+            <version>1.2.9</version>
         </Paymentwall_Paymentwall>
     </modules>
     <frontend>

diff --git a/src/lib/paymentwall-php b/src/lib/paymentwall-php
+193 −29		README.md
+8 −2		composer.json
+1 −1		features/charge.feature
+3 −3		features/pingback.feature
+56 −3		lib/Paymentwall/ApiObject.php
+3 −0		lib/Paymentwall/Config.php
+8 −8		lib/Paymentwall/HttpAction.php
+107 −0		lib/Paymentwall/Mobiamo.php
+30 −2		lib/Paymentwall/Pingback.php
+3 −0		lib/Paymentwall/Widget.php
+3 −1		lib/paymentwall.php