Adventos_OrderExport - Version 1.3.6

Version Notes

add state to address

Download this release

Release Info

Developer Karsten Hoffmann
Extension Adventos_OrderExport
Version 1.3.6
Comparing to
See all releases


Code changes from version 1.3.5 to 1.3.6

Files changed (3) hide show
  1. app/code/local/Adventos/OrderExport/Model/Observer.php +6 -1
  2. app/code/local/Adventos/OrderExport/etc/config.xml +1 -1
  3. package.xml +5 -5
app/code/local/Adventos/OrderExport/Model/Observer.php CHANGED
@@ -149,6 +149,9 @@ class Adventos_OrderExport_Model_Observer
149
 
150
  if ($discountAmount > 0) {
151
  $discount_percent = round(100 * $discountAmount / ($item->getQtyOrdered() * $item->getPrice()),2);
 
 
 
152
  }
153
  }
154
 
@@ -160,7 +163,7 @@ class Adventos_OrderExport_Model_Observer
160
  "product_name" => $item->getName(),
161
  "product_qty" => $item->getQtyOrdered(),
162
  "product_price" => $item->getPrice(),
163
- "product_discount_percent" => $discount_percent,
164
  "product_row_discount_amount" => $item->getDiscountAmount(),
165
  "product_row_price" => $product_row_price,
166
  "product_order_id" => $order->getRealOrderId(),
@@ -228,6 +231,7 @@ class Adventos_OrderExport_Model_Observer
228
  "city" => $order->getShippingAddress()->getCity(),
229
  "postcode" => $order->getShippingAddress()->getPostcode(),
230
  "country" => $order->getShippingAddress()->getCountry(),
 
231
  "phone" => $order->getShippingAddress()->getTelephone(),
232
  "addressid" => $order->getShippingAddress()->getCustomerAddressId(),
233
  "vatid" => $shipping_vat_id
@@ -241,6 +245,7 @@ class Adventos_OrderExport_Model_Observer
241
  "city" => $order->getBillingAddress()->getCity(),
242
  "postcode" => $order->getBillingAddress()->getPostcode(),
243
  "country" => $order->getBillingAddress()->getCountry(),
 
244
  "phone" => $order->getBillingAddress()->getTelephone(),
245
  "addressid" => $order->getBillingAddress()->getCustomerAddressId(),
246
  "vatid" => $billing_vat_id
149
 
150
  if ($discountAmount > 0) {
151
  $discount_percent = round(100 * $discountAmount / ($item->getQtyOrdered() * $item->getPrice()),2);
152
+ if ($discount_percent == 100.00){
153
+ $discount_percent = 99.99;
154
+ }
155
  }
156
  }
157
 
163
  "product_name" => $item->getName(),
164
  "product_qty" => $item->getQtyOrdered(),
165
  "product_price" => $item->getPrice(),
166
+ "product_discount_percent" => $item->getDiscountPercent(),
167
  "product_row_discount_amount" => $item->getDiscountAmount(),
168
  "product_row_price" => $product_row_price,
169
  "product_order_id" => $order->getRealOrderId(),
231
  "city" => $order->getShippingAddress()->getCity(),
232
  "postcode" => $order->getShippingAddress()->getPostcode(),
233
  "country" => $order->getShippingAddress()->getCountry(),
234
+ "versadr1" => $order->getShippingAddress()->getRegionCode(),
235
  "phone" => $order->getShippingAddress()->getTelephone(),
236
  "addressid" => $order->getShippingAddress()->getCustomerAddressId(),
237
  "vatid" => $shipping_vat_id
245
  "city" => $order->getBillingAddress()->getCity(),
246
  "postcode" => $order->getBillingAddress()->getPostcode(),
247
  "country" => $order->getBillingAddress()->getCountry(),
248
+ "versadr1" => $order->getBillingAddress()->getRegionCode(),
249
  "phone" => $order->getBillingAddress()->getTelephone(),
250
  "addressid" => $order->getBillingAddress()->getCustomerAddressId(),
251
  "vatid" => $billing_vat_id
app/code/local/Adventos/OrderExport/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Adventos_OrderExport>
5
- <version>1.3.5</version>
6
  </Adventos_OrderExport>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Adventos_OrderExport>
5
+ <version>1.3.6</version>
6
  </Adventos_OrderExport>
7
  </modules>
8
  <global>
package.xml CHANGED
@@ -1,19 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Adventos_OrderExport</name>
4
- <version>1.3.5</version>
5
  <stability>stable</stability>
6
  <license>OSL</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Magento integration for HeadOffice</summary>
10
  <description>Create Order XML file to integrate Magento with HeadOffice and synchronize stock, order status, invoice, shipments and credit memos.</description>
11
- <notes>add product_discount_percent&#xD;
12
  </notes>
13
  <authors><author><name>Karsten Hoffmann</name><user>adventos</user><email>karsten@adventos.de</email></author></authors>
14
- <date>2013-07-08</date>
15
- <time>15:15:09</time>
16
- <contents><target name="magelocal"><dir name="Adventos"><dir name="OrderExport"><dir name="Helper"><file name="Data.php" hash="f90dd7d2136cfb6349ba1d7ee939cd15"/></dir><dir name="Model"><dir name="Creditmemo"><dir name="Api"><file name="V2.php" hash="797a58eedbbe8bf1a0c20d7c8599f8be"/></dir><file name="Api.php" hash="c41e82cf79235d51f25d248719e93f92"/></dir><dir name="Invoice"><dir name="Api"><file name="V2.php" hash="3596dc5fe58a597ba5f244b52687288e"/></dir><file name="Api.php" hash="280512b1ae37690871384b3cba0a3a2b"/></dir><file name="Observer.php" hash="844d0e79c4bba2c9f3f6021d5e53162b"/><file name="Observer.php.def" hash="8849a673153fbab13536e3f83d605c3c"/><dir name="Shipment"><dir name="Api"><file name="V2.php" hash="3d7824e13e4d5cedb755b4858398f23e"/></dir><file name="Api.php" hash="0b9bf452b7e36c1ee5cefbb3d6c5eb3b"/></dir></dir><dir name="etc"><file name="api.xml" hash="c1b2bc277e329b8191bcc5358cb96581"/><file name="config.xml" hash="7f80bbb97299bd4448c0c7400a156edb"/><file name="system.xml" hash="d7feaf247eed064d617138508dd88fe4"/><file name="wsdl.xml" hash="1538d2cb05f819c45e807f992c1b7cb3"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Adventos_OrderExport.xml" hash="479b13bf3a08de9f93f5f58d77d3f9bb"/></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Adventos_OrderExport</name>
4
+ <version>1.3.6</version>
5
  <stability>stable</stability>
6
  <license>OSL</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Magento integration for HeadOffice</summary>
10
  <description>Create Order XML file to integrate Magento with HeadOffice and synchronize stock, order status, invoice, shipments and credit memos.</description>
11
+ <notes>add state to address&#xD;
12
  </notes>
13
  <authors><author><name>Karsten Hoffmann</name><user>adventos</user><email>karsten@adventos.de</email></author></authors>
14
+ <date>2013-08-22</date>
15
+ <time>15:49:11</time>
16
+ <contents><target name="magelocal"><dir name="Adventos"><dir name="OrderExport"><dir name="Helper"><file name="Data.php" hash="f90dd7d2136cfb6349ba1d7ee939cd15"/></dir><dir name="Model"><dir name="Creditmemo"><dir name="Api"><file name="V2.php" hash="797a58eedbbe8bf1a0c20d7c8599f8be"/></dir><file name="Api.php" hash="c41e82cf79235d51f25d248719e93f92"/></dir><dir name="Invoice"><dir name="Api"><file name="V2.php" hash="3596dc5fe58a597ba5f244b52687288e"/></dir><file name="Api.php" hash="280512b1ae37690871384b3cba0a3a2b"/></dir><file name="Observer.php" hash="6e92e4c475feaca7d51c205e1defb74a"/><file name="Observer.php.def" hash="8849a673153fbab13536e3f83d605c3c"/><dir name="Shipment"><dir name="Api"><file name="V2.php" hash="3d7824e13e4d5cedb755b4858398f23e"/></dir><file name="Api.php" hash="0b9bf452b7e36c1ee5cefbb3d6c5eb3b"/></dir></dir><dir name="etc"><file name="api.xml" hash="c1b2bc277e329b8191bcc5358cb96581"/><file name="config.xml" hash="cdbbf42811356eed0919a776765e98c9"/><file name="system.xml" hash="d7feaf247eed064d617138508dd88fe4"/><file name="wsdl.xml" hash="1538d2cb05f819c45e807f992c1b7cb3"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Adventos_OrderExport.xml" hash="479b13bf3a08de9f93f5f58d77d3f9bb"/></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>