Merge branch 'master' of https://github.com/aplazame/woocommerce

Author: calvinpy

.gitignore

@@ -9,7 +9,8 @@
 *.p12
 *.cer
 *.pem
-sftp-config.json
+*-config.json
 
 .build
 .wpcs
+.svn*

HISTORY.md

@@ -1,11 +1,20 @@
 ## Change Log
 
-#### [v0.0.4-dev](https://github.com/aplazame/woocommerce/tree/v0.0.3) (2015-??-??)
+#### [v0.0.5-dev](https://github.com/aplazame/woocommerce/tree/v0.0.5) (2015-??-??)
 
-[Full Changelog v0.0.4](https://github.com/aplazame/woocommerce/compare/v0.0.3...v0.0.4)
+[Full Changelog v0.0.5](https://github.com/aplazame/woocommerce/compare/v0.0.4...v0.0.5)
 
+* Fix PHP 5.3 compatibility
+* Minor improvements
 * ?
 
+#### [v0.0.4](https://github.com/aplazame/woocommerce/tree/v0.0.4) (2015-09-25)
+
+[Full Changelog v0.0.4](https://github.com/aplazame/woocommerce/compare/v0.0.3...v0.0.4)
+
+* Allow empty shipping
+* Fix security, order session key
+* Fix customer serializer
 
 #### [v0.0.3](https://github.com/aplazame/woocommerce/tree/v0.0.3) (2015-09-15)
 

README.md

@@ -1,6 +1,6 @@
 [ ![Image](https://aplazame.com/static/img/banners/banner-728-white-woo.png "Aplazame") ](https://aplazame.com "Aplazame")
 
-[![Package version](https://img.shields.io/packagist/v/aplazame/woocommerce.svg)](https://packagist.org/packages/aplazame/woocommerce) [![Build Status](http://drone.aplazame.com/api/badge/github.com/aplazame/woocommerce/status.svg?branch=master)](http://drone.aplazame.com/github.com/aplazame/woocommerce) [![Dependencies](https://www.versioneye.com/php/aplazame:woocommerce/badge.svg)](https://www.versioneye.com/php/aplazame:woocommerce)
+[![Package version](https://img.shields.io/packagist/v/aplazame/woocommerce.svg)](https://packagist.org/packages/aplazame/woocommerce) [![Plugin version](https://img.shields.io/wordpress/plugin/v/aplazame.svg)](https://wordpress.org/plugins/aplazame/) [![Build Status](http://drone.aplazame.com/api/badge/github.com/aplazame/woocommerce/status.svg?branch=master)](http://drone.aplazame.com/github.com/aplazame/woocommerce) [![Dependencies](https://www.versioneye.com/php/aplazame:woocommerce/badge.svg)](https://www.versioneye.com/php/aplazame:woocommerce)
 
 
 ### Install

README.txt

@@ -108,6 +108,14 @@ Of course, simply select an *"Aplazame refund"* in the product detail.
 
 == Changelog ==
 
+#### [v0.0.4] (2015-09-25)
+
+[view on Github](https://github.com/aplazame/woocommerce/tree/v0.0.4)
+
+* Allow empty shipping
+* Fix security, order session key
+* Fix customer serializer
+
 #### v0.0.3 (2015-09-15)
 
 [view on Github](https://github.com/aplazame/woocommerce/tree/v0.0.3)
@@ -135,6 +143,6 @@ Of course, simply select an *"Aplazame refund"* in the product detail.
 
 == Upgrade Notice ==
 
-= v0.0.3 =
+= v0.0.4 =
 
 The latest release has passed all quality checks.

aplazame.php

@@ -2,7 +2,7 @@
 /*
  * Plugin Name: Aplazame
  * Plugin URI: https://github.com/aplazame/woocommerce
- * Version: 0.0.3
+ * Version: 0.0.4
  * Description: Aplazame offers a payment method to receive funding for the purchases.
  * Author: calvin
  *
@@ -17,7 +17,7 @@
 
 class WC_Aplazame
 {
-    const VERSION = '0.0.3';
+    const VERSION = '0.0.4';
     const METHOD_ID = 'aplazame';
     const METHOD_TITLE = 'Aplazame';
 

classes/lib/Redirect.php

@@ -35,7 +35,8 @@ public static function get_the_ID()
 
     public static function payload()
     {
-        if (static::is_redirect()) {
+        if (static::is_redirect() &&
+                ((string) WC()->session->redirect_order_id === $_GET['order_id'])) {
             Aplazame_Helpers::render_to_template('gateway/redirect.php');
         }
     }

classes/sdk/Serializers.php

@@ -10,7 +10,8 @@ public static function woo_version()
             require_once(ABSPATH . 'wp-admin/includes/plugin.php');
         }
 
-        return get_plugins('/woocommerce')['woocommerce.php']['Version'];
+        $woo = get_plugins('/woocommerce');
+        return $woo['woocommerce.php']['Version'];
     }
 
     public static function get_meta()
@@ -52,18 +53,24 @@ public function get_articles($items)
         return $articles;
     }
 
-    public function get_customer($customer)
+    public function get_user($user)
     {
-        $serializer = array(
-            'id' => (string) $customer->id,
-            'type' => 'n',
+        return array(
+            'id' => (string) $user->id,
+            'type' => 'e',
             'gender' => 0,
-            'email' => $customer->user_email,
-            'first_name' => $customer->first_name,
-            'last_name' => $customer->last_name,
-            'date_joined' => date(DATE_ISO8601, $customer->user_registered));
+            'email' => $user->user_email,
+            'first_name' => $user->first_name,
+            'last_name' => $user->last_name,
+            'date_joined' => date(DATE_ISO8601, $user->user_registered));
+    }
 
-        return $serializer;
+    public function get_customer($billing_email)
+    {
+        return array(
+            'type' => 'n',
+            'gender' => 0,
+            'email' => $billing_email);
     }
 
     public function get_address($order, $type)
@@ -106,7 +113,7 @@ public function get_shipping_info($order)
     public function get_order($order)
     {
         $serializer = array(
-            'id' => $order->id,
+            'id' => (string) $order->id,
             'articles' => $this->get_articles($order->get_items()),
             'currency' => get_woocommerce_currency(),
             'total_amount' => Aplazame_Filters::decimals($order->get_total()),
@@ -116,9 +123,9 @@ public function get_order($order)
         return $serializer;
     }
 
-    public function get_checkout($order, $checkout_url, $customer)
+    public function get_checkout($order, $checkout_url, $user)
     {
-        return array(
+        $serializer = array(
             'toc' => true,
             'merchant' => array(
                 'confirmation_url' => home_url(
@@ -130,11 +137,19 @@ public function get_checkout($order, $checkout_url, $customer)
                 'success_url' => html_entity_decode(
                     $order->get_checkout_order_received_url())
             ),
-            'customer' => $this->get_customer($customer),
+            'customer' => $user->id?$this->get_user(
+                $user):$this->get_customer($order->billing_email),
             'order' => $this->get_order($order),
             'billing' => $this->get_address($order, 'billing'),
-            'shipping' => $this->get_shipping_info($order),
             'meta' => static::get_meta());
+
+        $shipping_method = $order->get_shipping_method();
+
+        if (!empty($shipping_method)) {
+            $serializer['shipping'] = $this->get_shipping_info($order);
+        }
+
+        return $serializer;
     }
 
     public function get_history($qs)

classes/wc-aplazame-gateway.php

@@ -55,6 +55,7 @@ public function payment_fields()
     public function process_payment($order_id)
     {
         $url = get_permalink(Aplazame_Redirect::get_the_ID());
+        WC()->session->redirect_order_id = $order_id;
 
         return array(
             'result' => 'success',
@@ -96,7 +97,7 @@ public function checks()
             echo '<div class="error"><p>' . $msg . '</p></div>';
         };
 
-        if ($this->settings['public_api_key'] || !$this->settings['private_api_key']) {
+        if (!$this->settings['public_api_key'] || !$this->settings['private_api_key']) {
             $_render_to_notice(sprintf(__(
                 'Aplazame gateway requires the API keys, please ' .
                 '<a href="%s">contact us</a> and take your keys.', 'aplazame'),

l10n/es/default.pot

@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Aplazame v0.0.3\n"
+"Project-Id-Version: Aplazame v0.0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-09-12 01:59+0200\n"
-"PO-Revision-Date: 2015-09-14 00:00+0200\n"
+"PO-Revision-Date: 2015-09-25 00:00+0200\n"
 "Last-Translator: Aplazame <[email protected]>\n"
 "Language-Team: Aplazame <[email protected]>\n"
 "Language: es_ES\n"

templates/gateway/redirect.php

@@ -7,12 +7,12 @@
 global $woocommerce;
 
 $cart = $woocommerce->cart;
-$customer = wp_get_current_user();
+$user = wp_get_current_user();
 $order = new WC_Order($_GET['order_id']);
 $serializer = new Aplazame_Serializers();
 ?>
 
 <script type="text/javascript">
   aplazame.checkout(<?php echo json_encode($serializer->get_checkout(
-    $order, $cart->get_checkout_url(), $customer), 128) ?>);
+    $order, $cart->get_checkout_url(), $user), 128) ?>);
 </script>