Magmodules_Fadello - Version 1.0.4

Version Notes

Fadello

Download this release

Release Info

Developer Magmodules
Extension Magmodules_Fadello
Version 1.0.4
Comparing to
See all releases


Code changes from version 1.0.3 to 1.0.4

Files changed (8) hide show
  1. app/code/community/Magmodules/Fadello/.DS_Store +0 -0
  2. app/code/community/Magmodules/Fadello/Block/.DS_Store +0 -0
  3. app/code/community/Magmodules/Fadello/Block/Adminhtml/.DS_Store +0 -0
  4. app/code/community/Magmodules/Fadello/Block/Adminhtml/System/.DS_Store +0 -0
  5. app/code/community/Magmodules/Fadello/Block/Adminhtml/System/Config/.DS_Store +0 -0
  6. app/code/community/Magmodules/Fadello/Model/Api.php +10 -5
  7. app/code/community/Magmodules/Fadello/etc/config.xml +1 -2
  8. package.xml +4 -4
app/code/community/Magmodules/Fadello/.DS_Store ADDED
Binary file
app/code/community/Magmodules/Fadello/Block/.DS_Store ADDED
Binary file
app/code/community/Magmodules/Fadello/Block/Adminhtml/.DS_Store ADDED
Binary file
app/code/community/Magmodules/Fadello/Block/Adminhtml/System/.DS_Store ADDED
Binary file
app/code/community/Magmodules/Fadello/Block/Adminhtml/System/Config/.DS_Store ADDED
Binary file
app/code/community/Magmodules/Fadello/Model/Api.php CHANGED
@@ -66,14 +66,14 @@ class Magmodules_Fadello_Model_Api extends Mage_Core_Helper_Abstract
66
  $deliverId = $apiResult['TransDeliverID'][0]['Deliver1'];
67
  $barcode = $apiResult['TransDeliverID'][0]['Barcode1'];
68
  $status = 'created';
69
-
70
  $order->setFadelloTransId($transId)
71
  ->setFadelloDeliverId($deliverId)
72
  ->setFadelloBarcode($barcode)
73
  ->setFadelloStatus($status)
74
  ->setFadelloColli($colli)
75
  ->save();
76
-
77
  $url = Mage::helper("adminhtml")->getUrl('*/fadello/getPdf', array('order_id' => $orderId));
78
  $result['status'] = 'Success';
79
  $result['success_msg'] = $this->__(
@@ -360,9 +360,14 @@ class Magmodules_Fadello_Model_Api extends Mage_Core_Helper_Abstract
360
  {
361
  if ($homeNoSep && isset($streetArr[1])) {
362
  $street = $streetArr[0];
363
- $homeNoString = str_replace(array('-', ','), ' ', $streetArr[1]);
364
- $homeNo = @reset(array_filter(preg_split("/\D+/", $homeNoString)));
365
- $homeNoAdd = trim(str_replace($homeNo, '', $homeNoString));
 
 
 
 
 
366
  return array('street' => $street, 'homeno' => $homeNo, 'homeno_add' => $homeNoAdd);
367
  } else {
368
  $street = $streetArr[0];
66
  $deliverId = $apiResult['TransDeliverID'][0]['Deliver1'];
67
  $barcode = $apiResult['TransDeliverID'][0]['Barcode1'];
68
  $status = 'created';
69
+
70
  $order->setFadelloTransId($transId)
71
  ->setFadelloDeliverId($deliverId)
72
  ->setFadelloBarcode($barcode)
73
  ->setFadelloStatus($status)
74
  ->setFadelloColli($colli)
75
  ->save();
76
+
77
  $url = Mage::helper("adminhtml")->getUrl('*/fadello/getPdf', array('order_id' => $orderId));
78
  $result['status'] = 'Success';
79
  $result['success_msg'] = $this->__(
360
  {
361
  if ($homeNoSep && isset($streetArr[1])) {
362
  $street = $streetArr[0];
363
+ if (isset($streetArr[2])) {
364
+ $homeNo = $streetArr[1];
365
+ $homeNoAdd = $streetArr[2];
366
+ } else {
367
+ $homeNoString = str_replace(array('-', ','), ' ', $streetArr[1]);
368
+ $homeNo = @reset(array_filter(preg_split("/\D+/", $homeNoString)));
369
+ $homeNoAdd = trim(str_replace($homeNo, '', $homeNoString));
370
+ }
371
  return array('street' => $street, 'homeno' => $homeNo, 'homeno_add' => $homeNoAdd);
372
  } else {
373
  $street = $streetArr[0];
app/code/community/Magmodules/Fadello/etc/config.xml CHANGED
@@ -17,11 +17,10 @@
17
  ~ @copyright Copyright (c) 2017 (http://www.magmodules.eu)
18
  ~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
  -->
20
-
21
  <config>
22
  <modules>
23
  <Magmodules_Fadello>
24
- <version>1.0.3</version>
25
  </Magmodules_Fadello>
26
  </modules>
27
  <global>
17
  ~ @copyright Copyright (c) 2017 (http://www.magmodules.eu)
18
  ~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
19
  -->
 
20
  <config>
21
  <modules>
22
  <Magmodules_Fadello>
23
+ <version>1.0.4</version>
24
  </Magmodules_Fadello>
25
  </modules>
26
  <global>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Magmodules_Fadello</name>
4
- <version>1.0.3</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.magmodules.eu/license-agreement/">Single Server License</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Fadello</description>
11
  <notes>Fadello</notes>
12
  <authors><author><name>Magmodules</name><user>magmodules</user><email>info@magmodules.nl</email></author></authors>
13
- <date>2017-04-14</date>
14
- <time>12:14:56</time>
15
- <contents><target name="magecommunity"><dir name="Magmodules"><dir name="Fadello"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Availability.php" hash="64913b7814babacd1ca98be1f7b471df"/><file name="Shipping.php" hash="e3b5fbe95d7ba0c851ecdeb9af1a0828"/></dir><dir name="Renderer"><file name="Select.php" hash="0cec29d42fd9cd861947d81b77b5e8b8"/></dir></dir></dir><dir name="Renderer"><file name="Shipment.php" hash="836b716e78bee03598dda5c475749669"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Datetime.php" hash="9ece732a223969d7560988b2b00b47a5"/><file name="Heading.php" hash="bfd7dd907ddac09e81909a1a2922c9e0"/><file name="Note.php" hash="5a8bf11167605594868a392cc57c6579"/><file name="Version.php" hash="bb824bb532efc7446dc49f63e5fbc7be"/></dir></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="27e10b033696e2221127b6a49d09e8bc"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Design"><file name="Availability.php" hash="416edf5e4a158fbd35157052289e41fb"/><file name="Shipping.php" hash="428c16b799df750709d6512cdded0884"/></dir></dir><dir name="Source"><file name="Days.php" hash="d2da23bd5162598137da002010c33272"/></dir></dir></dir></dir><file name="Api.php" hash="3a677da9d1549bebcc764bf0ba9e27ea"/><dir name="Carrier"><file name="ShippingMethod.php" hash="5396c66e3506d615ddf7e5b8211a3289"/></dir><file name="Observer.php" hash="afcb8e193677a8cd696d4db4013c1e69"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="FadelloController.php" hash="d9fed7e896b04c1864c66051071fa75f"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="c21568b2ecfbe36b0271e4e7fe37a0f3"/><file name="config.xml" hash="76370c3f3c55ecc667eda6f93f1e355e"/><file name="system.xml" hash="1f8b731c716137ab8e53692b312d4784"/></dir><dir name="sql"><dir name="fadello_setup"><file name="mysql4-install-0.9.0.php" hash="d51f8f1f961f798d1e7da372c02a4a32"/><file name="mysql4-upgrade-1.0.2-1.0.3.php" hash="896a3398d0130b90f48cf7b4d28f7074"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Magmodules_Fadello.xml" hash="5565183cd8b0543c266a95077d90c622"/></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Magmodules_Fadello.csv" hash="396606fa364a8f170e15d6be1c408ebe"/></dir><dir name="nl_NL"><file name="Magmodules_Fadello.csv" hash="a99468173196eeeb79e2e9d6673d1fb1"/></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="fadello"><file name="close.png" hash="c057a83b891418703c155c9a1382f8b9"/><file name="export.png" hash="21cef3823db6739081aea971e5789fa9"/><file name="pdf.png" hash="8df694ac11eae7090ccad5062b415020"/><file name="ship-mc.png" hash="2d9815c51cd3b98c30e6c83a05ca29b5"/><file name="ship.png" hash="05c70f071c5d3cfe6ffa86a1cd3561f7"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="magmodules"><dir name="fadello"><dir name="images"><file name="Fadello_logo3.png" hash="87130480e8187cf4c2fff28142440aa1"/></dir><file name="style.css" hash="ff9b3d7c2f1a166fee23007fc1ea7f4a"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="magmodules_fadello.xml" hash="569e347f70b4731daf77b6acc5a4488a"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>7.9.9</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Magmodules_Fadello</name>
4
+ <version>1.0.4</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.magmodules.eu/license-agreement/">Single Server License</license>
7
  <channel>community</channel>
10
  <description>Fadello</description>
11
  <notes>Fadello</notes>
12
  <authors><author><name>Magmodules</name><user>magmodules</user><email>info@magmodules.nl</email></author></authors>
13
+ <date>2017-05-18</date>
14
+ <time>13:15:39</time>
15
+ <contents><target name="magecommunity"><dir name="Magmodules"><dir name="Fadello"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Availability.php" hash="64913b7814babacd1ca98be1f7b471df"/><file name="Shipping.php" hash="e3b5fbe95d7ba0c851ecdeb9af1a0828"/></dir><dir name="Renderer"><file name="Select.php" hash="0cec29d42fd9cd861947d81b77b5e8b8"/></dir></dir></dir><dir name="Renderer"><file name="Shipment.php" hash="836b716e78bee03598dda5c475749669"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Datetime.php" hash="9ece732a223969d7560988b2b00b47a5"/><file name="Heading.php" hash="bfd7dd907ddac09e81909a1a2922c9e0"/><file name="Note.php" hash="5a8bf11167605594868a392cc57c6579"/><file name="Version.php" hash="bb824bb532efc7446dc49f63e5fbc7be"/></dir></dir><file name=".DS_Store" hash="8122f31070f90c271dab199f888c767f"/></dir><file name=".DS_Store" hash="4aac9e1db100b0a635d8555e76be07a3"/></dir><file name=".DS_Store" hash="da47bc2f2f003e3c79b6b824d71df39a"/></dir><file name=".DS_Store" hash="7448e3cc4f6df46edb67d502b2c330fe"/></dir><dir name="Helper"><file name="Data.php" hash="27e10b033696e2221127b6a49d09e8bc"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Design"><file name="Availability.php" hash="416edf5e4a158fbd35157052289e41fb"/><file name="Shipping.php" hash="428c16b799df750709d6512cdded0884"/></dir></dir><dir name="Source"><file name="Days.php" hash="d2da23bd5162598137da002010c33272"/></dir></dir></dir></dir><file name="Api.php" hash="5b6f7da9342785237d4260079f104278"/><dir name="Carrier"><file name="ShippingMethod.php" hash="5396c66e3506d615ddf7e5b8211a3289"/></dir><file name="Observer.php" hash="afcb8e193677a8cd696d4db4013c1e69"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="FadelloController.php" hash="d9fed7e896b04c1864c66051071fa75f"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="c21568b2ecfbe36b0271e4e7fe37a0f3"/><file name="config.xml" hash="4cf3bb30f7de1fb039ba1ce117ea6f5c"/><file name="system.xml" hash="1f8b731c716137ab8e53692b312d4784"/></dir><dir name="sql"><dir name="fadello_setup"><file name="mysql4-install-0.9.0.php" hash="d51f8f1f961f798d1e7da372c02a4a32"/><file name="mysql4-upgrade-1.0.2-1.0.3.php" hash="896a3398d0130b90f48cf7b4d28f7074"/></dir></dir><file name=".DS_Store" hash="4b6f2307f11e3f2f15c48e055cb7c96a"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Magmodules_Fadello.xml" hash="5565183cd8b0543c266a95077d90c622"/></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Magmodules_Fadello.csv" hash="396606fa364a8f170e15d6be1c408ebe"/></dir><dir name="nl_NL"><file name="Magmodules_Fadello.csv" hash="a99468173196eeeb79e2e9d6673d1fb1"/></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="images"><dir name="fadello"><file name="close.png" hash="c057a83b891418703c155c9a1382f8b9"/><file name="export.png" hash="21cef3823db6739081aea971e5789fa9"/><file name="pdf.png" hash="8df694ac11eae7090ccad5062b415020"/><file name="ship-mc.png" hash="2d9815c51cd3b98c30e6c83a05ca29b5"/><file name="ship.png" hash="05c70f071c5d3cfe6ffa86a1cd3561f7"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="magmodules"><dir name="fadello"><dir name="images"><file name="Fadello_logo3.png" hash="87130480e8187cf4c2fff28142440aa1"/></dir><file name="style.css" hash="ff9b3d7c2f1a166fee23007fc1ea7f4a"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="magmodules_fadello.xml" hash="569e347f70b4731daf77b6acc5a4488a"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>7.9.9</max></php></required></dependencies>
18
  </package>