Merge branch 'payment-api-v2' into 'master'

Use CBS Payment API v2

See merge request !53

src/main/edu/wisc/services/cbs/order/payment/OrderPayment.php

@@ -44,6 +44,9 @@ class OrderPayment extends MagentoOrder
     /** @var string Fixed for Magento orders */
     private $orderSource = MagentoOrder::ORDER_SOURCE;
 
+    /** @var string */
+    private $testMode;
+
     /**
      * @return string
      */
@@ -242,4 +245,22 @@ class OrderPayment extends MagentoOrder
         return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getTestMode()
+    {
+        return $this->testMode;
+    }
+
+    /**
+     * @param string $testMode
+     * @return OrderPayment
+     */
+    public function setTestMode($testMode)
+    {
+        $this->testMode = $testMode;
+        return $this;
+    }
+
 }
\ No newline at end of file

src/main/edu/wisc/services/cbs/order/payment/OrderPaymentInputParametersMapper.php

@@ -33,7 +33,8 @@ class OrderPaymentInputParametersMapper
             '',
             '',
             '',
-            new \DateTime()
+            new \DateTime(),
+            ''
         ))
             ->setP_ORDER_NUMBER($payment->getOrderNumber())
             ->setP_PAYMENT_INFO($payment->getPaymentInfo())
@@ -45,7 +46,8 @@ class OrderPaymentInputParametersMapper
             ->setP_TOTAL(MoneyConversion::convertMoneyToFloat($payment->getTotal()))
             ->setP_PAYMENT_NOTES($payment->getPaymentNotes())
             ->setP_SALES_REP($payment->getSalesRep())
-            ->setP_ORDER_SOURCE($payment->getOrderSource());
+            ->setP_ORDER_SOURCE($payment->getOrderSource())
+            ->setP_TEST_MODE($payment->getTestMode());
     }
 
 }

src/main/edu/wisc/services/cbs/order/payment/OrderPaymentService.php

@@ -11,7 +11,7 @@ interface OrderPaymentService extends Service
      * Submit an {@link OrderPayment} to CBS.
      *
      * @param OrderPayment $payment
-     * @return OrderServiceResponse
+     * @return OrderPaymentServiceResponse
      */
     public function createOrderPayment(OrderPayment $payment);
 

src/main/edu/wisc/services/cbs/order/payment/SoapOrderPaymentService.php

@@ -4,7 +4,7 @@ namespace edu\wisc\services\cbs\order\payment;
 
 use edu\wisc\services\cbs\api\SoapService;
 use edu\wisc\services\cbs\common\WssSoapHeaderBuilder;
-use edu\wisc\services\cbs\order\payment\generated\DOIT_SOA_PAYMENT_V1_Service;
+use edu\wisc\services\cbs\order\payment\generated\DOIT_SOA_PAYMENT_V2_Service;
 use edu\wisc\services\cbs\order\payment\generated\OutputParameters;
 
 use Money\Money;
@@ -15,7 +15,7 @@ use Money\Money;
 class SoapOrderPaymentService implements OrderPaymentService, SoapService
 {
 
-    /** @var DOIT_SOA_PAYMENT_V1_Service */
+    /** @var DOIT_SOA_PAYMENT_V2_Service */
     private $soapClient;
 
     /**
@@ -27,9 +27,9 @@ class SoapOrderPaymentService implements OrderPaymentService, SoapService
             $this->soapClient = $paymentSoapClient;
             return;
         }
-        $this->soapClient = new DOIT_SOA_PAYMENT_V1_Service(
+        $this->soapClient = new DOIT_SOA_PAYMENT_V2_Service(
             [],
-            __DIR__ . '/../../../../../../resources/doit_soa_payment_v1.xml'
+            __DIR__ . '/../../../../../../resources/doit_soa_payment_v2.xml'
         );
         $this->soapClient->__setSoapHeaders(WssSoapHeaderBuilder::buildUsernameToken($username, $password));
     }

src/main/edu/wisc/services/cbs/order/payment/generated/DOIT_SOA_PAYMENT_V1_Service.php → src/main/edu/wisc/services/cbs/order/payment/generated/DOIT_SOA_PAYMENT_V2_Service.php

@@ -2,7 +2,7 @@
 
 namespace edu\wisc\services\cbs\order\payment\generated;
 
-class DOIT_SOA_PAYMENT_V1_Service extends \SoapClient
+class DOIT_SOA_PAYMENT_V2_Service extends \SoapClient
 {
 
     /**
@@ -29,7 +29,7 @@ class DOIT_SOA_PAYMENT_V1_Service extends \SoapClient
       'features' => 1,
     ), $options);
       if (!$wsdl) {
-        $wsdl = 'src/main/resources/doit_soa_payment_v1.xml';
+        $wsdl = 'src/main/resources/doit_soa_payment_v2.xml';
       }
       parent::__construct($wsdl, $options);
     }

src/main/edu/wisc/services/cbs/order/payment/generated/InputParameters.php

@@ -70,6 +70,11 @@ class InputParameters
      */
     protected $P_PAYMENT_DATE = null;
 
+    /**
+     * @var string $P_TEST_MODE
+     */
+    protected $P_TEST_MODE = null;
+
     /**
      * @param float $P_ORDER_NUMBER
      * @param string $P_ORIG_SYS_DOCUMENT_REF
@@ -84,8 +89,9 @@ class InputParameters
      * @param string $P_SALES_REP
      * @param string $P_ORDER_SOURCE
      * @param \DateTime $P_PAYMENT_DATE
+     * @param string $P_TEST_MODE
      */
-    public function __construct($P_ORDER_NUMBER, $P_ORIG_SYS_DOCUMENT_REF, $P_PAYMENT_TYPE, $P_PAYMENT_INFO, $P_CASH_REGISTER, $P_RENDERD_AMOUNT, $P_SUBTOTAL, $P_TAX, $P_TOTAL, $P_PAYMENT_NOTES, $P_SALES_REP, $P_ORDER_SOURCE, \DateTime $P_PAYMENT_DATE)
+    public function __construct($P_ORDER_NUMBER, $P_ORIG_SYS_DOCUMENT_REF, $P_PAYMENT_TYPE, $P_PAYMENT_INFO, $P_CASH_REGISTER, $P_RENDERD_AMOUNT, $P_SUBTOTAL, $P_TAX, $P_TOTAL, $P_PAYMENT_NOTES, $P_SALES_REP, $P_ORDER_SOURCE, \DateTime $P_PAYMENT_DATE, $P_TEST_MODE)
     {
       $this->P_ORDER_NUMBER = $P_ORDER_NUMBER;
       $this->P_ORIG_SYS_DOCUMENT_REF = $P_ORIG_SYS_DOCUMENT_REF;
@@ -100,6 +106,7 @@ class InputParameters
       $this->P_SALES_REP = $P_SALES_REP;
       $this->P_ORDER_SOURCE = $P_ORDER_SOURCE;
       $this->P_PAYMENT_DATE = $P_PAYMENT_DATE->format(\DateTime::ATOM);
+      $this->P_TEST_MODE = $P_TEST_MODE;
     }
 
     /**
@@ -344,4 +351,22 @@ class InputParameters
       return $this;
     }
 
+    /**
+     * @return string
+     */
+    public function getP_TEST_MODE()
+    {
+      return $this->P_TEST_MODE;
+    }
+
+    /**
+     * @param string $P_TEST_MODE
+     * @return \edu\wisc\services\cbs\order\payment\generated\InputParameters
+     */
+    public function setP_TEST_MODE($P_TEST_MODE)
+    {
+      $this->P_TEST_MODE = $P_TEST_MODE;
+      return $this;
+    }
+
 }

src/main/edu/wisc/services/cbs/order/payment/generated/autoload.php

 <?php
 
 
- function autoload_5cfc44f520c3fd922b108b560ea5543e($class)
+ function autoload_8d57331e741d60c809fd7513ebff3374($class)
 {
     $classes = array(
-        'edu\wisc\services\cbs\order\payment\generated\DOIT_SOA_PAYMENT_V1_Service' => __DIR__ .'/DOIT_SOA_PAYMENT_V1_Service.php',
+        'edu\wisc\services\cbs\order\payment\generated\DOIT_SOA_PAYMENT_V2_Service' => __DIR__ .'/DOIT_SOA_PAYMENT_V2_Service.php',
         'edu\wisc\services\cbs\order\payment\generated\InputParameters' => __DIR__ .'/InputParameters.php',
         'edu\wisc\services\cbs\order\payment\generated\OutputParameters' => __DIR__ .'/OutputParameters.php',
         'edu\wisc\services\cbs\order\payment\generated\SOAHeader' => __DIR__ .'/SOAHeader.php'
@@ -14,7 +14,7 @@
     };
 }
 
-spl_autoload_register('autoload_5cfc44f520c3fd922b108b560ea5543e');
+spl_autoload_register('autoload_8d57331e741d60c809fd7513ebff3374');
 
 // Do nothing. The rest is just leftovers from the code generation.
 {

src/main/resources/doit_soa_payment_v2.xml

+<?xml version = '1.0' encoding = 'UTF-8'?><definitions name="DOIT_SOA_PAYMENT_V2" targetNamespace="http://xmlns.oracle.com/apps/ont/soaprovider/plsql/doit_soa_payment_v2/" xmlns:tns="http://xmlns.oracle.com/apps/ont/soaprovider/plsql/doit_soa_payment_v2/" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns1="http://xmlns.oracle.com/apps/ont/soaprovider/plsql/doit_soa_payment_v2/payment_create/">   <types>      <schema xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://xmlns.oracle.com/apps/ont/soaprovider/plsql/doit_soa_payment_v2/payment_create/">         <include schemaLocation="http://pegasus.doit.wisc.edu:8018/webservices/SOAProvider/plsql/doit_soa_payment_v2/APPS_DOIT_SOA_PAYMENT_V2_PAYMENT_CREATE.xsd"/>      </schema>      <schema xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://xmlns.oracle.com/apps/ont/soaprovider/plsql/doit_soa_payment_v2/">         <element name="SOAHeader">            <complexType>               <sequence>                  <element name="Responsibility" minOccurs="0" type="string"/>                  <element name="RespApplication" minOccurs="0" type="string"/>                  <element name="SecurityGroup" minOccurs="0" type="string"/>                  <element name="NLSLanguage" minOccurs="0" type="string"/>                  <element name="Org_Id" minOccurs="0" type="string"/>               </sequence>            </complexType>         </element>      </schema>   </types>   <message name="PAYMENT_CREATE_Input_Msg">      <part name="header" element="tns:SOAHeader"/>      <part name="body" element="tns1:InputParameters"/>   </message>   <message name="PAYMENT_CREATE_Output_Msg">      <part name="body" element="tns1:OutputParameters"/>   </message>   <portType name="DOIT_SOA_PAYMENT_V2_PortType">      <operation name="PAYMENT_CREATE">         <input message="tns:PAYMENT_CREATE_Input_Msg"/>         <output message="tns:PAYMENT_CREATE_Output_Msg"/>      </operation>   </portType>   <binding name="DOIT_SOA_PAYMENT_V2_Binding" type="tns:DOIT_SOA_PAYMENT_V2_PortType">      <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>      <operation name="PAYMENT_CREATE">         <soap:operation soapAction="http://pegasus.doit.wisc.edu:8018/webservices/SOAProvider/plsql/doit_soa_payment_v2/"/>         <input>            <soap:header message="tns:PAYMENT_CREATE_Input_Msg" part="header" use="literal"/>            <soap:body parts="body" use="literal"/>         </input>         <output>            <soap:body use="literal"/>         </output>      </operation>   </binding>   <service name="DOIT_SOA_PAYMENT_V2_Service">      <port name="DOIT_SOA_PAYMENT_V2_Port" binding="tns:DOIT_SOA_PAYMENT_V2_Binding">         <soap:address location="http://pegasus.doit.wisc.edu:8018/webservices/SOAProvider/plsql/doit_soa_payment_v2/"/>      </port>   </service></definitions>
\ No newline at end of file