Skip to content
This repository has been archived by the owner on Mar 25, 2019. It is now read-only.

Commit

Permalink
Merge pull request #2359 from spryker/feature/ratepay-demo
Browse files Browse the repository at this point in the history
Feature/ratepay after demo accepted
  • Loading branch information
dereuromark committed Nov 23, 2016
2 parents b0339bd + f8525d0 commit 535ff3c
Show file tree
Hide file tree
Showing 148 changed files with 3,111 additions and 968 deletions.
22 changes: 22 additions & 0 deletions assets/Yves/js/modules/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/**
* Copyright (c) 2016-present Spryker Systems GmbH. All rights reserved.
* Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.
*/

'use strict';

var $ = require('jquery');

$(document).ready(function() {
$('#paymentForm_ratepayInstallment_debit_pay_type').on('change', function(event) {
var sectionPattern = '.ratepay-installment-pay-type-' + $(event.target).val().toLowerCase();
$('.ratepay-installment-pay-type').hide();
$(sectionPattern).show();
}).trigger('change');

$('#paymentForm_ratepayInstallment_installment_calculation_type').on('change', function(event) {
var sectionPattern = '.ratepay-installment-' + $(event.target).val().toLowerCase();
$('.ratepay-installment-calculation-type').hide();
$(sectionPattern).show();
}).trigger('change');
});
8 changes: 8 additions & 0 deletions assets/Yves/js/spryker-yves-ratepay-main.entry.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* Copyright (c) 2016-present Spryker Systems GmbH. All rights reserved.
* Use of this software requires acceptance of the Evaluation License Agreement. See LICENSE file.
*/

'use strict';

require('./modules/main');
8 changes: 8 additions & 0 deletions assets/Yves/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"private": true,
"name": "spryker-yves-ratepay",
"version": "1.0.0",
"dependencies": {
"jquery": "~2.2.0"
}
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"spryker/guzzle": "^2.1.0",
"spryker/installer": "^2.0.0 || ^3.0.0",
"spryker/kernel": "^2.0.0",
"spryker/library": "^2.0.0",
"spryker/money": "^1.0.0",
"spryker/log": "^2.0.0",
"spryker/messenger": "^2.1.0",
"spryker/monolog": "^2.0.0",
Expand Down
23 changes: 17 additions & 6 deletions config/Zed/Oms/RatepayElv01.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@

<process name="RatepayElv01" main="true">
<subprocesses>
<process>RatepayPaymentRequest</process>
<process>RatepayShipment</process>
<process>RatepayRefund</process>
<process>RatepayCancel</process>
</subprocesses>

<states>
<state name="new" reserved="true"/>
<state name="payment confirmation initialized"/>
<state name="payment confirmed"/>

<state name="ready for refund" />
<state name="refund succeeded" />
<state name="completed" />
Expand All @@ -31,22 +34,28 @@
</states>

<transitions>
<transition happy="true" condition="Ratepay/IsPaymentConfirmed">
<transition happy="true">
<source>new</source>
<target>payment request initialized</target>
<event>init payment request</event>
</transition>

<transition happy="true" condition="Ratepay/IsPaymentConfirmed">
<source>payment confirmation initialized</source>
<target>payment confirmed</target>
<event>create payment confirmation</event>
</transition>

<transition>
<source>new</source>
<source>payment confirmation initialized</source>
<target>confirm payment invalid</target>
<event>create payment confirmation</event>
</transition>

<transition happy="true">
<source>payment confirmed</source>
<target>ready for shipment</target>
<event>ready for shipment</event>
<event>prepare for shipment</event>
</transition>

<transition happy="true" condition="Ratepay/IsDeliveryConfirmed">
Expand All @@ -63,15 +72,17 @@
</transitions>

<events>
<event name="init payment request" onEnter="true" />
<event name="create payment confirmation" onEnter="true" command="Ratepay/ConfirmPayment" />
<event name="create delivery confirmation" onEnter="true" command="Ratepay/ConfirmDelivery" />
<event name="ready for shipment" onEnter="true" />
<event name="item not returned" timeout="90days" />
<event name="item returned" onEnter="true" />
<event name="prepare for shipment" onEnter="true" />
<event name="waiting for return" timeout="90days" />
<event name="complete refund" onEnter="true" />
<event name="return" manual="true" />
</events>
</process>

<process name="RatepayPaymentRequest" file="RatepaySubProcesses/RatepayPaymentRequest.xml"/>
<process name="RatepayShipment" file="RatepaySubProcesses/RatepayShipment.xml"/>
<process name="RatepayRefund" file="RatepaySubProcesses/RatepayRefund.xml"/>
<process name="RatepayCancel" file="RatepaySubProcesses/RatepayCancel.xml"/>
Expand Down
24 changes: 18 additions & 6 deletions config/Zed/Oms/RatepayInstallment01.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,17 @@

<process name="RatepayInstallment01" main="true">
<subprocesses>
<process>RatepayPaymentRequest</process>
<process>RatepayShipment</process>
<process>RatepayRefund</process>
<process>RatepayCancel</process>
</subprocesses>

<states>
<state name="new" reserved="true"/>
<state name="payment confirmation initialized"/>
<state name="payment confirmed"/>

<state name="ready for refund" />
<state name="refund succeeded" />
<state name="completed" />
Expand All @@ -31,22 +34,29 @@
</states>

<transitions>
<transition happy="true" condition="Ratepay/IsPaymentConfirmed">

<transition happy="true">
<source>new</source>
<target>payment request initialized</target>
<event>init payment request</event>
</transition>

<transition happy="true" condition="Ratepay/IsPaymentConfirmed">
<source>payment confirmation initialized</source>
<target>payment confirmed</target>
<event>create payment confirmation</event>
</transition>

<transition>
<source>new</source>
<source>payment confirmation initialized</source>
<target>confirm payment invalid</target>
<event>create payment confirmation</event>
</transition>

<transition happy="true">
<source>payment confirmed</source>
<target>ready for shipment</target>
<event>ready for shipment</event>
<event>prepare for shipment</event>
</transition>

<transition happy="true" condition="Ratepay/IsDeliveryConfirmed">
Expand All @@ -63,15 +73,17 @@
</transitions>

<events>
<event name="init payment request" onEnter="true" />
<event name="create payment confirmation" onEnter="true" command="Ratepay/ConfirmPayment" />
<event name="create delivery confirmation" onEnter="true" command="Ratepay/ConfirmDelivery" />
<event name="ready for shipment" onEnter="true" />
<event name="item not returned" timeout="90days" />
<event name="item returned" onEnter="true" />
<event name="prepare for shipment" onEnter="true" />
<event name="waiting for return" timeout="90days" />
<event name="complete refund" onEnter="true" />
<event name="return" manual="true" />
</events>
</process>

<process name="RatepayPaymentRequest" file="RatepaySubProcesses/RatepayPaymentRequest.xml"/>
<process name="RatepayShipment" file="RatepaySubProcesses/RatepayShipment.xml"/>
<process name="RatepayRefund" file="RatepaySubProcesses/RatepayRefund.xml"/>
<process name="RatepayCancel" file="RatepaySubProcesses/RatepayCancel.xml"/>
Expand Down
27 changes: 18 additions & 9 deletions config/Zed/Oms/RatepayInvoice01.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@

<process name="RatepayInvoice01" main="true">
<subprocesses>
<process>RatepayPaymentRequest</process>
<process>RatepayShipment</process>
<process>RatepayRefund</process>
<process>RatepayCancel</process>
</subprocesses>

<states>
<state name="new" reserved="true"/>
<state name="payment confirmation initialized"/>
<state name="payment confirmed"/>

<state name="ready for refund" />
Expand All @@ -33,22 +35,28 @@
</states>

<transitions>
<transition happy="true" condition="Ratepay/IsPaymentConfirmed">
<transition happy="true">
<source>new</source>
<target>payment request initialized</target>
<event>init payment request</event>
</transition>

<transition happy="true" condition="Ratepay/IsPaymentConfirmed">
<source>payment confirmation initialized</source>
<target>payment confirmed</target>
<event>create payment confirmation</event>
</transition>

<transition>
<source>new</source>
<source>payment confirmation initialized</source>
<target>confirm payment invalid</target>
<event>create payment confirmation</event>
</transition>a
</transition>

<transition happy="true" >
<source>payment confirmed</source>
<target>ready for shipment</target>
<event>ready for shipment</event>
<event>prepare for shipment</event>
</transition>

<transition happy="true" condition="Ratepay/IsDeliveryConfirmed">
Expand All @@ -65,17 +73,18 @@
</transitions>

<events>
<event name="start payment confirmation" onEnter="true" command="Ratepay/ConfirmPayment"/>
<event name="create payment confirmation" onEnter="true" />
<event name="init payment request" onEnter="true" />
<event name="create payment confirmation" onEnter="true" command="Ratepay/ConfirmPayment"/>
<event name="create delivery confirmation" onEnter="true" command="Ratepay/ConfirmDelivery" />
<event name="ready for shipment" onEnter="true" />
<event name="item not returned" timeout="90days" />
<event name="item returned" onEnter="true" />
<event name="prepare for shipment" onEnter="true" />
<event name="waiting for return" timeout="90days" />
<event name="complete refund" onEnter="true" />
<event name="return" manual="true" />
<event name="check cancellation" onEnter="true" />
</events>
</process>

<process name="RatepayPaymentRequest" file="RatepaySubProcesses/RatepayPaymentRequest.xml"/>
<process name="RatepayShipment" file="RatepaySubProcesses/RatepayShipment.xml"/>
<process name="RatepayRefund" file="RatepaySubProcesses/RatepayRefund.xml"/>
<process name="RatepayCancel" file="RatepaySubProcesses/RatepayCancel.xml"/>
Expand Down
23 changes: 16 additions & 7 deletions config/Zed/Oms/RatepayPrepayment01.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@

<process name="RatepayPrepayment01" main="true">
<subprocesses>
<process>RatepayPaymentRequest</process>
<process>RatepayShipment</process>
<process>RatepayRefund</process>
<process>RatepayCancel</process>
</subprocesses>

<states>
<state name="new" reserved="true"/>

<state name="payment confirmation initialized"/>
<state name="payment confirmed"/>

<state name="ready for refund" />
Expand All @@ -33,22 +34,28 @@
</states>

<transitions>
<transition happy="true" condition="Ratepay/IsPaymentConfirmed">
<transition happy="true">
<source>new</source>
<target>payment request initialized</target>
<event>init payment request</event>
</transition>

<transition happy="true" condition="Ratepay/IsPaymentConfirmed">
<source>payment confirmation initialized</source>
<target>payment confirmed</target>
<event>create payment confirmation</event>
</transition>

<transition>
<source>new</source>
<source>payment confirmation initialized</source>
<target>confirm payment invalid</target>
<event>create payment confirmation</event>
</transition>

<transition happy="true">
<source>payment confirmed</source>
<target>ready for shipment</target>
<event>ready for shipment</event>
<event>prepare for shipment</event>
</transition>

<transition happy="true" condition="Ratepay/IsDeliveryConfirmed">
Expand All @@ -65,16 +72,18 @@
</transitions>

<events>
<event name="init payment request" onEnter="true" />
<event name="create payment confirmation" manual="true" command="Ratepay/ConfirmPayment"/>
<event name="create delivery confirmation" onEnter="true" command="Ratepay/ConfirmDelivery" />
<event name="payment not received" timeout="3days" />
<event name="ready for shipment" onEnter="true" />
<event name="item not returned" timeout="90days" />
<event name="item returned" onEnter="true" />
<event name="prepare for shipment" onEnter="true" />
<event name="waiting for return" timeout="90days" />
<event name="complete refund" onEnter="true" />
<event name="return" manual="true" />
</events>
</process>

<process name="RatepayPaymentRequest" file="RatepaySubProcesses/RatepayPaymentRequest.xml"/>
<process name="RatepayShipment" file="RatepaySubProcesses/RatepayShipment.xml"/>
<process name="RatepayRefund" file="RatepaySubProcesses/RatepayRefund.xml"/>
<process name="RatepayCancel" file="RatepaySubProcesses/RatepayCancel.xml"/>
Expand Down
32 changes: 32 additions & 0 deletions config/Zed/Oms/RatepaySubProcesses/RatepayPaymentRequest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?xml version="1.0"?>
<statemachine
xmlns="spryker:oms-01"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="spryker:oms-01 http://static.spryker.com/oms-01.xsd">

<process name="RatepayPaymentRequest">

<states>
<state name="payment request initialized"/>
<state name="payment request invalid"/>
</states>

<transitions>
<transition happy="true" condition="Ratepay/IsPaymentRequestSuccess">
<source>payment request initialized</source>
<target>payment confirmation initialized</target>
<event>do payment request</event>
</transition>

<transition>
<source>payment request initialized</source>
<target>payment request invalid</target>
<event>do payment request</event>
</transition>

</transitions>
<events>
<event name="do payment request" onEnter="true" command="Ratepay/PaymentRequest" />
</events>
</process>
</statemachine>
4 changes: 2 additions & 2 deletions config/Zed/Oms/RatepaySubProcesses/RatepayRefund.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
<transition happy="true">
<source>ready for refund</source>
<target>completed</target>
<event>item not returned</event>
<event>waiting for return</event>
</transition>
<transition>
<source>refund succeeded</source>
<target>completed</target>
<event>item returned</event>
<event>complete refund</event>
</transition>
</transitions>

Expand Down
Loading

0 comments on commit 535ff3c

Please sign in to comment.