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

Commit

Permalink
Merge remote-tracking branch 'project/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
dereuromark committed Nov 10, 2016
2 parents 71c277c + ee5a4ed commit c1dad65
Show file tree
Hide file tree
Showing 19 changed files with 44 additions and 315 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,4 @@ npm-debug.log

# tools
composer.phar
c3.php
280 changes: 0 additions & 280 deletions c3.php

This file was deleted.

2 changes: 1 addition & 1 deletion codeception.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ coverage:
enabled: true
remote: true
c3_url: 'http://zed.de.spryker.dev'
whitelist: { include: ['src/*.php'] }
whitelist: { include: ['src/Pyz/*.php'] }

extensions:
enabled:
Expand Down
9 changes: 6 additions & 3 deletions config/Zed/StateMachine/Test/Invoice01.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0"?>
<statemachine
xmlns="http://static.spryker.com"
xmlns="spryker:state-machine"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://static.spryker.com http://static.spryker.com/state-machine-01.xsd">
xsi:schemaLocation="spryker:state-machine http://static.spryker.com/state-machine-01.xsd">
<!-- Used as example XML for Pyz\Zed\StateMachineExample implementation -->

<process name="Invoice01" main="true">

<states>
<state name="new"/>
<state name="invoice created">
Expand Down Expand Up @@ -127,6 +129,7 @@
<event>item not returned</event>
</transition>
</transitions>

</process>

</statemachine>
2 changes: 1 addition & 1 deletion config/Zed/navigation.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0"?>
<config>
<!-- You can control navigation order here and add your custom navigation entries -->
<sales/>
Expand Down
14 changes: 7 additions & 7 deletions config/Zed/oms/Nopayment01.xml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0"?>
<statemachine
xmlns="http://static.spryker.com"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://static.spryker.com http://static.spryker.com/oms-01.xsd">
xmlns="spryker:oms"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="spryker:oms http://static.spryker.com/oms-01.xsd">
<!-- Used as example XML for OMS implementation -->

<process name="Nopayment01" main="true">

<states>
<state name="new" reserved="true"/>
<state name="waiting for payment"/>
Expand Down Expand Up @@ -71,20 +73,18 @@
<target>returned</target>
<event>return</event>
</transition>

</transitions>

<events>

<event name="authorize" onEnter="true" manual="true"/>
<event name="paid" manual="true" />
<event name="pick" manual="true" />
<event name="ship" manual="true" />
<event name="forward" onEnter="true" />
<event name="close" manual="true" />
<event name="return" manual="true" />

</events>

</process>

</statemachine>
4 changes: 2 additions & 2 deletions src/Pyz/Shared/Customer/Transfer/customer.transfer.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<transfers xmlns="http://xsd.spryker.com"
<transfers xmlns="spryker:transfer"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://static.spryker.com http://static.spryker.com/transfer-01.xsd" >
xsi:schemaLocation="spryker:transfer http://static.spryker.com/transfer-01.xsd" >

<transfer name="Customer">
<property name="phone" type="string" />
Expand Down
4 changes: 2 additions & 2 deletions src/Pyz/Shared/Sales/Transfer/sales.transfer.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<transfers xmlns="http://xsd.spryker.com"
<transfers xmlns="spryker:transfer"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://static.spryker.com http://static.spryker.com/transfer-01.xsd" >
xsi:schemaLocation="spryker:transfer http://static.spryker.com/transfer-01.xsd" >

<transfer name="OrderList">
<property name="pagination" type="Pagination" />
Expand Down
5 changes: 3 additions & 2 deletions src/Pyz/Shared/Search/Transfer/search.transfer.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<?xml version="1.0"?>
<transfers xmlns="http://xsd.spryker.com"
<transfers xmlns="spryker:transfer"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xsd.spryker.com ../../src/Spryker/TransferObjectDefinitionSchema.xsd">
xsi:schemaLocation="spryker:transfer http://static.spryker.com/transfer-01.xsd" >

<transfer name="PageMap">
<property name="isFeatured" type="bool" />
</transfer>

</transfers>
Loading

0 comments on commit c1dad65

Please sign in to comment.