Owebia_Shipping_2 - Version 2.5.16

Version Notes

[2.5.16 - 24 juillet 2014]
Correction d'un bug suite à la modification de la récupération de la session dans la version 2.5.14 : appel de $quote->collectTotals();

Download this release

Release Info

Developer Magento Core Team
Extension Owebia_Shipping_2
Version 2.5.16
Comparing to
See all releases


Code changes from version 2.5.15 to 2.5.16

Files changed (44) hide show
  1. app/code/community/Owebia/Shipping2/Block/Adminhtml/Os2/Editor.php +1 -1
  2. app/code/community/Owebia/Shipping2/Block/Adminhtml/Os2/Editor/Property/Input.php +1 -1
  3. app/code/community/Owebia/Shipping2/Block/Adminhtml/Os2/Help.php +1 -1
  4. app/code/community/Owebia/Shipping2/Block/Adminhtml/System/Config/Form/Field/Config.php +1 -1
  5. app/code/community/Owebia/Shipping2/Block/Adminhtml/System/Config/Form/Field/Informations.php +1 -1
  6. app/code/community/Owebia/Shipping2/Controller/Abstract.php +1 -1
  7. app/code/community/Owebia/Shipping2/Helper/Data.php +1 -1
  8. app/code/community/Owebia/Shipping2/Model/Carrier/Abstract.php +1 -1
  9. app/code/community/Owebia/Shipping2/Model/Carrier/OwebiaShipping1.php +1 -1
  10. app/code/community/Owebia/Shipping2/Model/Carrier/OwebiaShipping2.php +1 -1
  11. app/code/community/Owebia/Shipping2/Model/Carrier/OwebiaShipping3.php +1 -1
  12. app/code/community/Owebia/Shipping2/Model/Carrier/OwebiaShipping4.php +1 -1
  13. app/code/community/Owebia/Shipping2/Model/Mysql4/Setup.php +1 -1
  14. app/code/community/Owebia/Shipping2/Model/Os2/Data/Abstract.php +1 -1
  15. app/code/community/Owebia/Shipping2/Model/Os2/Data/AbstractWithAttributes.php +1 -1
  16. app/code/community/Owebia/Shipping2/Model/Os2/Data/Address.php +1 -1
  17. app/code/community/Owebia/Shipping2/Model/Os2/Data/AddressFilter.php +1 -1
  18. app/code/community/Owebia/Shipping2/Model/Os2/Data/AttributeSet.php +1 -1
  19. app/code/community/Owebia/Shipping2/Model/Os2/Data/Billto.php +1 -1
  20. app/code/community/Owebia/Shipping2/Model/Os2/Data/Cart.php +2 -1
  21. app/code/community/Owebia/Shipping2/Model/Os2/Data/CartItem.php +1 -1
  22. app/code/community/Owebia/Shipping2/Model/Os2/Data/Category.php +1 -1
  23. app/code/community/Owebia/Shipping2/Model/Os2/Data/Customer.php +1 -1
  24. app/code/community/Owebia/Shipping2/Model/Os2/Data/CustomerGroup.php +1 -1
  25. app/code/community/Owebia/Shipping2/Model/Os2/Data/Customvar.php +1 -1
  26. app/code/community/Owebia/Shipping2/Model/Os2/Data/Date.php +1 -1
  27. app/code/community/Owebia/Shipping2/Model/Os2/Data/Info.php +1 -1
  28. app/code/community/Owebia/Shipping2/Model/Os2/Data/Product.php +1 -1
  29. app/code/community/Owebia/Shipping2/Model/Os2/Data/Quote.php +4 -2
  30. app/code/community/Owebia/Shipping2/Model/Os2/Data/Selection.php +1 -1
  31. app/code/community/Owebia/Shipping2/Model/Os2/Data/StockItem.php +1 -1
  32. app/code/community/Owebia/Shipping2/Model/Os2/Data/Store.php +1 -1
  33. app/code/community/Owebia/Shipping2/Model/System/Config/Source/LoadOnParent.php +1 -1
  34. app/code/community/Owebia/Shipping2/Model/System/Config/Source/ProcessChildren.php +1 -1
  35. app/code/community/Owebia/Shipping2/changelog +3 -0
  36. app/code/community/Owebia/Shipping2/controllers/Adminhtml/Os2/AjaxController.php +1 -1
  37. app/code/community/Owebia/Shipping2/doc_en_US.html +14 -0
  38. app/code/community/Owebia/Shipping2/doc_fr_FR.html +14 -0
  39. app/code/community/Owebia/Shipping2/etc/adminhtml.xml +1 -1
  40. app/code/community/Owebia/Shipping2/etc/config.xml +1 -1
  41. app/code/community/Owebia/Shipping2/etc/system.xml +1 -1
  42. app/code/community/Owebia/Shipping2/includes/OS2_AddressFilterParser.php +1 -1
  43. app/code/community/Owebia/Shipping2/includes/OwebiaShippingHelper.php +1 -1
  44. package.xml +6 -6
app/code/community/Owebia/Shipping2/Block/Adminhtml/Os2/Editor.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Block/Adminhtml/Os2/Editor/Property/Input.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Block/Adminhtml/Os2/Help.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Block/Adminhtml/System/Config/Form/Field/Config.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Block/Adminhtml/System/Config/Form/Field/Informations.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Controller/Abstract.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Helper/Data.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Carrier/Abstract.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Carrier/OwebiaShipping1.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Carrier/OwebiaShipping2.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Carrier/OwebiaShipping3.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Carrier/OwebiaShipping4.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Mysql4/Setup.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/Abstract.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/AbstractWithAttributes.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/Address.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/AddressFilter.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/AttributeSet.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/Billto.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/Cart.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -33,6 +33,7 @@ class Owebia_Shipping2_Model_Os2_Data_Cart extends Owebia_Shipping2_Model_Os2_Da
33
$this->_options = $arguments['options'];
34
35
$quote = Mage::getSingleton('checkout/session')->getQuote();
36
$shipping_address = $quote->getShippingAddress();
37
$this->_data = array(
38
'price-tax+discount' => (double)$quote->getData('subtotal_with_discount'), //$request->getData('package_value_with_discount'),
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
33
$this->_options = $arguments['options'];
34
35
$quote = Mage::getSingleton('checkout/session')->getQuote();
36
+ $quote->collectTotals(); // very important subtotal, subtotal_with_discount and grand_total are empty
37
$shipping_address = $quote->getShippingAddress();
38
$this->_data = array(
39
'price-tax+discount' => (double)$quote->getData('subtotal_with_discount'), //$request->getData('package_value_with_discount'),
app/code/community/Owebia/Shipping2/Model/Os2/Data/CartItem.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/Category.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/Customer.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/CustomerGroup.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/Customvar.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/Date.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/Info.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/Product.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/Quote.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
@@ -25,6 +25,8 @@ class Owebia_Shipping2_Model_Os2_Data_Quote extends Owebia_Shipping2_Model_Os2_D
25
26
protected function _loadObject()
27
{
28
- return Mage::getSingleton('checkout/session')->getQuote();
29
}
30
}
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
25
26
protected function _loadObject()
27
{
28
+ $quote = Mage::getSingleton('checkout/session')->getQuote();
29
+ $quote->collectTotals(); // very important subtotal, subtotal_with_discount and grand_total are empty
30
+ return $quote;
31
}
32
}
app/code/community/Owebia/Shipping2/Model/Os2/Data/Selection.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/StockItem.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/Os2/Data/Store.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/System/Config/Source/LoadOnParent.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/Model/System/Config/Source/ProcessChildren.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/changelog CHANGED
@@ -1,3 +1,6 @@
1
[2.5.15 - 07 juin 2014]
2
Remplacement de static:: par self:: pour une r�tro-compatibilit� avec PHP < 5.3
3
1
+ [2.5.16 - 24 juillet 2014]
2
+ Correction d'un bug suite � la modification de la r�cup�ration de la session dans la version 2.5.14 : appel de $quote->collectTotals();
3
+
4
[2.5.15 - 07 juin 2014]
5
Remplacement de static:: par self:: pour une r�tro-compatibilit� avec PHP < 5.3
6
app/code/community/Owebia/Shipping2/controllers/Adminhtml/Os2/AjaxController.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/doc_en_US.html CHANGED
@@ -844,6 +844,20 @@ pre.changelog{white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre
844
<h2>Changelog</h2>
845
846
<pre class=changelog>
847
[2.5.13 - November 5, 2013]
848
Fixed a bug occuring when auto-escaping strings in tables (thanks to Sylvain P.)
849
Fixed a bug in the calculation of variables {car.price+tax+discount} and {cart.price+tax-discount} when the cart contains bundle products (thanks to Nematis)
844
<h2>Changelog</h2>
845
846
<pre class=changelog>
847
+ [2.5.16 - 24 juillet 2014]
848
+ Correction d'un bug suite à la modification de la récupération de la session dans la version 2.5.14 : appel de $quote->collectTotals();
849
+
850
+ [2.5.15 - 07 juin 2014]
851
+ Remplacement de static:: par self:: pour une rétro-compatibilité avec PHP < 5.3
852
+
853
+ [2.5.14 - 26 mai 2014]
854
+ Correction des retours lignes dans 3 fichiers : CR => CRLF (merci à Christophe S.)
855
+ Correction d'un bug avec l'utilisation des expressions régulières et des caractères joker dans le filtrage des adresses (merci à Alexis A., Morgan R., Maxime L.)
856
+ Correction d'un bug dans le calcul de la valeur {cart.price+tax+discount}
857
+ Correction d'un bug dans la récupération de la session (merci à Gabriel F.)
858
+ Support des nombres au format 2.04e2 avec le e en minuscule (merci à Morgan R.)
859
+ Ajout de la possibilité d'avoir des espaces, des virgules et des tirets dans le nom des codes région en entourant les valeurs par des guillemets (ne pas oublier de les échapper si nécessaire)
860
+
861
[2.5.13 - November 5, 2013]
862
Fixed a bug occuring when auto-escaping strings in tables (thanks to Sylvain P.)
863
Fixed a bug in the calculation of variables {car.price+tax+discount} and {cart.price+tax-discount} when the cart contains bundle products (thanks to Nematis)
app/code/community/Owebia/Shipping2/doc_fr_FR.html CHANGED
@@ -840,6 +840,20 @@ pre.changelog{white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre
840
<h2>Changelog</h2>
841
842
<pre class=changelog>
843
[2.5.13 - 5 novembre 2013]
844
Correction d'un bug avec l'auto-escaping des chaînes de caractères dans les tableaux (merci à Sylvain P.)
845
Correction d'un bug dans le calcul des variables {car.price+tax+discount} et {cart.price+tax-discount} lorsque le panier contenait des produits packagés (merci à Nematis)
840
<h2>Changelog</h2>
841
842
<pre class=changelog>
843
+ [2.5.16 - 24 juillet 2014]
844
+ Correction d'un bug suite à la modification de la récupération de la session dans la version 2.5.14 : appel de $quote->collectTotals();
845
+
846
+ [2.5.15 - 07 juin 2014]
847
+ Remplacement de static:: par self:: pour une rétro-compatibilité avec PHP < 5.3
848
+
849
+ [2.5.14 - 26 mai 2014]
850
+ Correction des retours lignes dans 3 fichiers : CR => CRLF (merci à Christophe S.)
851
+ Correction d'un bug avec l'utilisation des expressions régulières et des caractères joker dans le filtrage des adresses (merci à Alexis A., Morgan R., Maxime L.)
852
+ Correction d'un bug dans le calcul de la valeur {cart.price+tax+discount}
853
+ Correction d'un bug dans la récupération de la session (merci à Gabriel F.)
854
+ Support des nombres au format 2.04e2 avec le e en minuscule (merci à Morgan R.)
855
+ Ajout de la possibilité d'avoir des espaces, des virgules et des tirets dans le nom des codes région en entourant les valeurs par des guillemets (ne pas oublier de les échapper si nécessaire)
856
+
857
[2.5.13 - 5 novembre 2013]
858
Correction d'un bug avec l'auto-escaping des chaînes de caractères dans les tableaux (merci à Sylvain P.)
859
Correction d'un bug dans le calcul des variables {car.price+tax+discount} et {cart.price+tax-discount} lorsque le panier contenait des produits packagés (merci à Nematis)
app/code/community/Owebia/Shipping2/etc/adminhtml.xml CHANGED
@@ -1,7 +1,7 @@
1
<?xml version="1.0" ?>
2
<!--
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?xml version="1.0" ?>
2
<!--
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/etc/config.xml CHANGED
@@ -22,7 +22,7 @@
22
<config>
23
<modules>
24
<Owebia_Shipping2>
25
- <version>2.5.14</version>
26
<depends>
27
<Mage_Shipping />
28
</depends>
22
<config>
23
<modules>
24
<Owebia_Shipping2>
25
+ <version>2.5.16</version>
26
<depends>
27
<Mage_Shipping />
28
</depends>
app/code/community/Owebia/Shipping2/etc/system.xml CHANGED
@@ -1,7 +1,7 @@
1
<?xml version="1.0"?>
2
<!--
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?xml version="1.0"?>
2
<!--
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/includes/OS2_AddressFilterParser.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
app/code/community/Owebia/Shipping2/includes/OwebiaShippingHelper.php CHANGED
@@ -1,7 +1,7 @@
1
<?php
2
3
/**
4
- * Copyright (c) 2008-13 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
1
<?php
2
3
/**
4
+ * Copyright (c) 2008-14 Owebia
5
*
6
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
7
* to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
package.xml CHANGED
@@ -1,7 +1,7 @@
1
<?xml version="1.0"?>
2
<package>
3
<name>Owebia_Shipping_2</name>
4
- <version>2.5.15</version>
5
<stability>stable</stability>
6
<license uri="http://www.opensource.org/licenses/MIT">The MIT License (MIT)</license>
7
<channel>community</channel>
@@ -10,12 +10,12 @@
10
<description>[EN] This module provides 3 shipping modes configurable with a very flexible syntax.&#xD;
11
&#xD;
12
[FR] Ce module met &#xE0; disposition 3 modes de livraison configurables avec une syntaxe tr&#xE8;s souple.</description>
13
- <notes>[2.5.15 - 07 juin 2014]&#xD;
14
- Remplacement de static:: par self:: pour une r&#xE9;tro-compatibilit&#xE9; avec PHP &lt; 5.3</notes>
15
<authors><author><name>owebia</name><user>auto-converted</user><email>antoine.lemoine@owebia.com</email></author></authors>
16
- <date>2014-06-07</date>
17
- <time>00:55:51</time>
18
- <contents><target name="magecommunity"><dir name="Owebia"><dir name="Shipping2"><dir name="Block"><dir name="Adminhtml"><dir name="Os2"><dir name="Editor"><dir name="Property"><file name="Input.php" hash="3d6cbadd3f93b7456c07aea93e95c351"/></dir></dir><file name="Editor.php" hash="e7e687f1777024f59905ff7c294240b2"/><file name="Help.php" hash="2344a81adf3ef3cb4de7bef0254fc91b"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Config.php" hash="a8fa16d6fbe0040dbe3f82a5d35c3549"/><file name="Informations.php" hash="8cc48900c8d21eb1f6da4e4c81022707"/></dir></dir></dir></dir></dir></dir><dir name="Controller"><file name="Abstract.php" hash="271c15e20d257ff8852149728cbf1625"/></dir><dir name="Helper"><file name="Data.php" hash="09d2c0209a5db7af579ecc1b73cd3843"/></dir><dir name="Model"><dir name="Carrier"><file name="Abstract.php" hash="e99b2ee4aefaa3ccf63873c590c1a644"/><file name="OwebiaShipping1.php" hash="0c6ef06ce84e8af21d1c44480af6391b"/><file name="OwebiaShipping2.php" hash="b9696696be13ee5f284b705cf2adb3d2"/><file name="OwebiaShipping3.php" hash="d8c488dda9ab5adf835d9a2bea169b3c"/><file name="OwebiaShipping4.php" hash="d19c02368763dea101dc33dae7abad41"/></dir><dir name="Mysql4"><file name="Setup.php" hash="aa7ede8eb6c0cf2c36a8f0bbff447165"/></dir><dir name="Os2"><dir name="Data"><file name="Abstract.php" hash="7de45e45599f1a21e7a76aed4a326e8d"/><file name="AbstractWithAttributes.php" hash="53296361d4c5b793db565c9617537f1d"/><file name="Address.php" hash="152f918ee67fa1127b7f5c72f7b6ff7c"/><file name="AddressFilter.php" hash="2d6bff3709ac903b4fd02c9af1afb820"/><file name="AttributeSet.php" hash="c2871abf3d8fdf0c5d8c820fd3f2d0c3"/><file name="Billto.php" hash="21cd103dcf3deeb1c1e9113569e9fff9"/><file name="Cart.php" hash="0b829d168d5e692e34a998c7eff02655"/><file name="CartItem.php" hash="291de4e670969f904b4e597e31c87e4c"/><file name="Category.php" hash="9976b5038f13c6f725816eadf7870fa8"/><file name="Customer.php" hash="3ebaeaffa0097552874d102bc35da987"/><file name="CustomerGroup.php" hash="8ba23c3ad93f5e59d50175274e8c0b63"/><file name="Customvar.php" hash="505a38c3803ebe0f863616e1a41afc2b"/><file name="Date.php" hash="4204356324da1c89622723927421e56f"/><file name="Info.php" hash="60e8158d518ff4d6368b549ad24e27ee"/><file name="Product.php" hash="9005d84d17f8147f9b1cee5131d73f6a"/><file name="Quote.php" hash="a05ed6a2526b7f8768d5b61b476c98b2"/><file name="Selection.php" hash="b0435629222bdcc95040dae39c3b9d5f"/><file name="StockItem.php" hash="180807358f2e1f04c58ec175c2975736"/><file name="Store.php" hash="1cdbe0feae559a6f0ba6060fe6cd532f"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="LoadOnParent.php" hash="5982d79417ab309daa6a05217b0058b0"/><file name="ProcessChildren.php" hash="8dbe7c271b79d4b93ddd360a4bbc49b7"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Os2"><file name="AjaxController.php" hash="80f4591fd20de88467e0f5996e3d3f1c"/></dir></dir><dir name="Checkout"><file name="CartController.php" hash="8c6ee136298e0e2dd0052143887282ce"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="9c290c251a8612b5bfd00f9254cc17c8"/><file name="config.xml" hash="e1b79b36a0dc4bc25f7cd2a417a7df25"/><file name="system.xml" hash="b0319b613b8a127352f113a3c518ab9c"/></dir><dir name="includes"><file name="OS2_AddressFilterParser.php" hash="997021a4b3b2e4bcbad548723e1148d8"/><file name="OwebiaShippingHelper.php" hash="d5b744f8fedf59800c963054a2313864"/></dir><dir name="sql"><dir name="owebia_shipping2_setup"><file name="mysql4-install-2.5.13.php" hash="807dad21a089045946ab1cf2b433f954"/></dir></dir><file name="changelog" hash="9084089e9694c30168b5f07dc8cdafb0"/><file name="doc_en_US.html" hash="d4b2e41297f2ad3cbee2fa964ef491a2"/><file name="doc_fr_FR.html" hash="1dba3654b5c525a8ff677d27c7c1e458"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Owebia_Shipping2.xml" hash="046e4a5822bd9a6c2e781bfbb33f7ebd"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Owebia_Shipping2.csv" hash="e9d54947d5b38eb975fc0de4145ffe23"/></dir><dir name="fr_FR"><file name="Owebia_Shipping2.csv" hash="a8c41b1a205a92de71b9e4621532c97d"/></dir></target><target name="mage"><dir name="js"><dir name="owebia"><dir name="shipping2"><dir name="colorbox"><dir name="images"><dir name="ie6"><file name="borderBottomCenter.png" hash="1936585831e8bcf4eb5ef1081c8e2574"/><file name="borderBottomLeft.png" hash="7ceeb01563f030dc47837fd8bad29488"/><file name="borderBottomRight.png" hash="297fb77440870d91f519bcecdb312725"/><file name="borderMiddleLeft.png" hash="64df0244eeaade27764d2cf33606527b"/><file name="borderMiddleRight.png" hash="9fa458eaaa35b80b2452f35a1d6b4d0c"/><file name="borderTopCenter.png" hash="01ecb01841270f3a765aadf4900929f3"/><file name="borderTopLeft.png" hash="bf4949b95b09d255edd9bcb8358a3557"/><file name="borderTopRight.png" hash="51315fa19507a33d5f1b5411598593e7"/></dir><file name="border.png" hash="439d585a4e35279cf1eddec5729f7144"/><file name="border.png-" hash="7ca8a1d2eb0763b35c266cd54bee2fa5"/><file name="controls.png" hash="4cbe54bbf6c352ea181a5739842215e2"/><file name="controls.png-" hash="b68b9ecaae424de4862ba0d055b7a560"/><file name="loading.gif" hash="e6611f867d63754b7a2a974fb0a0e7dc"/><file name="loading_background.png" hash="acf427e932fb9413700a4b8b58b41eec"/><file name="overlay.png" hash="790376e15a036959e358a19d4a7ea437"/></dir><file name="colorbox.css" hash="1a7dd23f5d2962260d5bb26a57046db1"/><file name="jquery.colorbox-min.js" hash="afa27e7333f494cf87e4c07297c2160b"/></dir><dir name="img"><dir name="famfamsilk"><file name="help.png" hash="c3812c74bc524179f4ccf5d2db7b3cbf"/><file name="pencil.png" hash="a34e71ab08a6d1162b948d26321dea50"/></dir><file name="btn-edit.png" hash="abc9f604977fc6dc75547a2e04c9748f"/><file name="btn-help.png" hash="b743486f26c3b69871490049147ef14b"/><file name="btn-remove.png" hash="42492684e24356a4081134894eabeb9e"/></dir><dir name="jquery-ui-1.8.23.custom"><dir name="css"><dir name="ui-lightness"><dir name="images"><file name="ui-bg_diagonals-thick_18_b81900_40x40.png" hash="95f9cceeb9d742dd3e917ec16ed754f8"/><file name="ui-bg_diagonals-thick_20_666666_40x40.png" hash="f040b255ca13e693da34ab33c7d6b554"/><file name="ui-bg_flat_10_000000_40x100.png" hash="c18cd01623c7fed23c80d53e2f5e7c78"/><file name="ui-bg_glass_100_f6f6f6_1x400.png" hash="5f1847175ba18c41322cb9cb0581e0fb"/><file name="ui-bg_glass_100_fdf5ce_1x400.png" hash="d26e8f463195a7b86f86b7d550cfc114"/><file name="ui-bg_glass_65_ffffff_1x400.png" hash="e5a8f32e28fd5c27bf0fed33c8a8b9b5"/><file name="ui-bg_gloss-wave_35_f6a828_500x100.png" hash="58d2cd501e01573cf537089c694ba899"/><file name="ui-bg_highlight-soft_100_eeeeee_1x100.png" hash="384c3f17709ba0f809b023b6e7b10b84"/><file name="ui-bg_highlight-soft_75_ffe45c_1x100.png" hash="b806658954cb4d16ade8977af737f486"/><file name="ui-icons_222222_256x240.png" hash="ebe6b6902a408fbf9cac6379a1477525"/><file name="ui-icons_228ef1_256x240.png" hash="79f41c0765e9ec18562b20b0801d748b"/><file name="ui-icons_ef8c08_256x240.png" hash="ef9a6ccfe3b14041928ddc708665b226"/><file name="ui-icons_ffd27a_256x240.png" hash="ab8c30acc0e3608fb79e01fccf832c70"/><file name="ui-icons_ffffff_256x240.png" hash="342bc03f6264c75d3f1d7f99e34295b9"/></dir><file name="jquery-ui-1.8.23.custom.css" hash="d4a4e04116e9bed6a2b00c5e8c260914"/></dir></dir><dir name="js"><file name="jquery-1.8.0.min.js" hash="cd8b0bffc85bb5614385ee4ce3596d07"/><file name="jquery-ui-1.8.23.custom.min.js" hash="c406c4654466fbeee1cf9173b69ec55c"/></dir></dir><file name="jquery-1.8.2.min.js" hash="cfa9051cc0b05eb519f1e16b2a6645d7"/><file name="jquery.caret.1.02.min.js" hash="ee130de5e6b9ae2be7579a5fd77f7b23"/><file name="jquery.layout-1.3.0-rc30.6.min.js" hash="745e5e2084b6330c3f837a0169a96320"/><file name="jquery.layout.min.js" hash="d91b61c69554cd02f4cf3bbbf97b95a8"/><file name="jquery.noconflict.js" hash="3179f2255b046d5f2e9a71e365287bef"/><file name="os2editor.css" hash="96805f469cf7d6f2a7269d5d372fa46b"/><file name="os2editor.js" hash="107807e905cb39f178c1e349c7d89cb8"/></dir></dir></dir></target></contents>
19
<compatible/>
20
<dependencies/>
21
</package>
1
<?xml version="1.0"?>
2
<package>
3
<name>Owebia_Shipping_2</name>
4
+ <version>2.5.16</version>
5
<stability>stable</stability>
6
<license uri="http://www.opensource.org/licenses/MIT">The MIT License (MIT)</license>
7
<channel>community</channel>
10
<description>[EN] This module provides 3 shipping modes configurable with a very flexible syntax.&#xD;
11
&#xD;
12
[FR] Ce module met &#xE0; disposition 3 modes de livraison configurables avec une syntaxe tr&#xE8;s souple.</description>
13
+ <notes>[2.5.16 - 24 juillet 2014]&#xD;
14
+ Correction d'un bug suite &#xE0; la modification de la r&#xE9;cup&#xE9;ration de la session dans la version 2.5.14 : appel de $quote-&gt;collectTotals();</notes>
15
<authors><author><name>owebia</name><user>auto-converted</user><email>antoine.lemoine@owebia.com</email></author></authors>
16
+ <date>2014-07-24</date>
17
+ <time>07:47:49</time>
18
+ <contents><target name="magecommunity"><dir name="Owebia"><dir name="Shipping2"><dir name="Block"><dir name="Adminhtml"><dir name="Os2"><dir name="Editor"><dir name="Property"><file name="Input.php" hash="da443c90f3dda730300654569b55d46c"/></dir></dir><file name="Editor.php" hash="571ff0d5da00f96a49aa9c0504d07a50"/><file name="Help.php" hash="d2f3fd818f9d5034365e0c57cd01448e"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Config.php" hash="66487da1f208546729207661de30e378"/><file name="Informations.php" hash="34eda44f2b4646f2acfe07be52440058"/></dir></dir></dir></dir></dir></dir><dir name="Controller"><file name="Abstract.php" hash="f1ad9781bcc1fe1382a714958fdaf388"/></dir><dir name="Helper"><file name="Data.php" hash="2fb3cb6c82405981376fa72a4142af10"/></dir><dir name="Model"><dir name="Carrier"><file name="Abstract.php" hash="c5eebb34bb97952d6ced04e6d17049ea"/><file name="OwebiaShipping1.php" hash="6e4aa3ba4b3ec09a344a0f6a666645d1"/><file name="OwebiaShipping2.php" hash="e6a5d90fcf89910c119dad51a226a5ab"/><file name="OwebiaShipping3.php" hash="1a556c06950805f4d0b709e5f6b35743"/><file name="OwebiaShipping4.php" hash="ef18ccb1f5ed3e14ac93f40f69871a6e"/></dir><dir name="Mysql4"><file name="Setup.php" hash="79dd512a2278429c69ec92d0064e6bf3"/></dir><dir name="Os2"><dir name="Data"><file name="Abstract.php" hash="6d1aa6bf9270e0af4f349f2279760a80"/><file name="AbstractWithAttributes.php" hash="f51eedef920565ef5acbbb570af47805"/><file name="Address.php" hash="924940393fdf382b41d469e448be1e2d"/><file name="AddressFilter.php" hash="1ebed8610ace2b0f319c90ab6661b856"/><file name="AttributeSet.php" hash="8530ba04c22811a0014a39f03b389c75"/><file name="Billto.php" hash="fa430451c5d8cc01120e790607182546"/><file name="Cart.php" hash="883599102b224514bd695a84f14e4994"/><file name="CartItem.php" hash="42077e6f3055ec2a06c71b6fda08ef7c"/><file name="Category.php" hash="947a56f34136065e9ed5d5f8b775d408"/><file name="Customer.php" hash="12045cf6dcfba428f24cde46412e51bd"/><file name="CustomerGroup.php" hash="dec898287825c0afab6f96b01fcc2b3c"/><file name="Customvar.php" hash="e9b59523ba14d23d1aeeaa4a8e432bec"/><file name="Date.php" hash="8e2120bb4b5c2c840f1fcbaf4f630f24"/><file name="Info.php" hash="922a1b57d0cb72e59335851e1a92cacc"/><file name="Product.php" hash="687b819acf9524bea522ed0c56e16249"/><file name="Quote.php" hash="395a47b59cc190bf7875c0259eeee32b"/><file name="Selection.php" hash="8a055d68edfc5210cec7611f2d43448b"/><file name="StockItem.php" hash="b0345ea37ad9826a2822a911752cf06f"/><file name="Store.php" hash="f5e2f014a372e83787928e7f0218b12f"/></dir></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="LoadOnParent.php" hash="31d5c899a174dc5ee046be9ec4080f5e"/><file name="ProcessChildren.php" hash="f7a1c4fd61bc52cfd29c3079c64a01fb"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Os2"><file name="AjaxController.php" hash="b954504ea1ba4fcebee59df9036efc9c"/></dir></dir><dir name="Checkout"><file name="CartController.php" hash="8c6ee136298e0e2dd0052143887282ce"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="553cc9ec895436e0da108020de260885"/><file name="config.xml" hash="26608eaa0838ee76e2dbddbdb6fa6427"/><file name="system.xml" hash="e549ba889f6d9b05e154ca49ab455ae0"/></dir><dir name="includes"><file name="OS2_AddressFilterParser.php" hash="867b63a23ee99b6cafb51e91759a9d00"/><file name="OwebiaShippingHelper.php" hash="7ca683da565a38e04b31cbc1f0552c1a"/></dir><dir name="sql"><dir name="owebia_shipping2_setup"><file name="mysql4-install-2.5.13.php" hash="807dad21a089045946ab1cf2b433f954"/></dir></dir><file name="changelog" hash="74e13a5f7008af2b57f984e93e5ffb1f"/><file name="doc_en_US.html" hash="bfab8cf7876b7de271eece0f32c5be5d"/><file name="doc_fr_FR.html" hash="8c4e55c7b1fe7fa533f85f2536e67dfa"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Owebia_Shipping2.xml" hash="046e4a5822bd9a6c2e781bfbb33f7ebd"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Owebia_Shipping2.csv" hash="e9d54947d5b38eb975fc0de4145ffe23"/></dir><dir name="fr_FR"><file name="Owebia_Shipping2.csv" hash="a8c41b1a205a92de71b9e4621532c97d"/></dir></target><target name="mage"><dir name="js"><dir name="owebia"><dir name="shipping2"><dir name="colorbox"><dir name="images"><dir name="ie6"><file name="borderBottomCenter.png" hash="1936585831e8bcf4eb5ef1081c8e2574"/><file name="borderBottomLeft.png" hash="7ceeb01563f030dc47837fd8bad29488"/><file name="borderBottomRight.png" hash="297fb77440870d91f519bcecdb312725"/><file name="borderMiddleLeft.png" hash="64df0244eeaade27764d2cf33606527b"/><file name="borderMiddleRight.png" hash="9fa458eaaa35b80b2452f35a1d6b4d0c"/><file name="borderTopCenter.png" hash="01ecb01841270f3a765aadf4900929f3"/><file name="borderTopLeft.png" hash="bf4949b95b09d255edd9bcb8358a3557"/><file name="borderTopRight.png" hash="51315fa19507a33d5f1b5411598593e7"/></dir><file name="border.png" hash="439d585a4e35279cf1eddec5729f7144"/><file name="border.png-" hash="7ca8a1d2eb0763b35c266cd54bee2fa5"/><file name="controls.png" hash="4cbe54bbf6c352ea181a5739842215e2"/><file name="controls.png-" hash="b68b9ecaae424de4862ba0d055b7a560"/><file name="loading.gif" hash="e6611f867d63754b7a2a974fb0a0e7dc"/><file name="loading_background.png" hash="acf427e932fb9413700a4b8b58b41eec"/><file name="overlay.png" hash="790376e15a036959e358a19d4a7ea437"/></dir><file name="colorbox.css" hash="1a7dd23f5d2962260d5bb26a57046db1"/><file name="jquery.colorbox-min.js" hash="afa27e7333f494cf87e4c07297c2160b"/></dir><dir name="img"><dir name="famfamsilk"><file name="help.png" hash="c3812c74bc524179f4ccf5d2db7b3cbf"/><file name="pencil.png" hash="a34e71ab08a6d1162b948d26321dea50"/></dir><file name="btn-edit.png" hash="abc9f604977fc6dc75547a2e04c9748f"/><file name="btn-help.png" hash="b743486f26c3b69871490049147ef14b"/><file name="btn-remove.png" hash="42492684e24356a4081134894eabeb9e"/></dir><dir name="jquery-ui-1.8.23.custom"><dir name="css"><dir name="ui-lightness"><dir name="images"><file name="ui-bg_diagonals-thick_18_b81900_40x40.png" hash="95f9cceeb9d742dd3e917ec16ed754f8"/><file name="ui-bg_diagonals-thick_20_666666_40x40.png" hash="f040b255ca13e693da34ab33c7d6b554"/><file name="ui-bg_flat_10_000000_40x100.png" hash="c18cd01623c7fed23c80d53e2f5e7c78"/><file name="ui-bg_glass_100_f6f6f6_1x400.png" hash="5f1847175ba18c41322cb9cb0581e0fb"/><file name="ui-bg_glass_100_fdf5ce_1x400.png" hash="d26e8f463195a7b86f86b7d550cfc114"/><file name="ui-bg_glass_65_ffffff_1x400.png" hash="e5a8f32e28fd5c27bf0fed33c8a8b9b5"/><file name="ui-bg_gloss-wave_35_f6a828_500x100.png" hash="58d2cd501e01573cf537089c694ba899"/><file name="ui-bg_highlight-soft_100_eeeeee_1x100.png" hash="384c3f17709ba0f809b023b6e7b10b84"/><file name="ui-bg_highlight-soft_75_ffe45c_1x100.png" hash="b806658954cb4d16ade8977af737f486"/><file name="ui-icons_222222_256x240.png" hash="ebe6b6902a408fbf9cac6379a1477525"/><file name="ui-icons_228ef1_256x240.png" hash="79f41c0765e9ec18562b20b0801d748b"/><file name="ui-icons_ef8c08_256x240.png" hash="ef9a6ccfe3b14041928ddc708665b226"/><file name="ui-icons_ffd27a_256x240.png" hash="ab8c30acc0e3608fb79e01fccf832c70"/><file name="ui-icons_ffffff_256x240.png" hash="342bc03f6264c75d3f1d7f99e34295b9"/></dir><file name="jquery-ui-1.8.23.custom.css" hash="d4a4e04116e9bed6a2b00c5e8c260914"/></dir></dir><dir name="js"><file name="jquery-1.8.0.min.js" hash="cd8b0bffc85bb5614385ee4ce3596d07"/><file name="jquery-ui-1.8.23.custom.min.js" hash="c406c4654466fbeee1cf9173b69ec55c"/></dir></dir><file name="jquery-1.8.2.min.js" hash="cfa9051cc0b05eb519f1e16b2a6645d7"/><file name="jquery.caret.1.02.min.js" hash="ee130de5e6b9ae2be7579a5fd77f7b23"/><file name="jquery.layout-1.3.0-rc30.6.min.js" hash="745e5e2084b6330c3f837a0169a96320"/><file name="jquery.layout.min.js" hash="d91b61c69554cd02f4cf3bbbf97b95a8"/><file name="jquery.noconflict.js" hash="3179f2255b046d5f2e9a71e365287bef"/><file name="os2editor.css" hash="96805f469cf7d6f2a7269d5d372fa46b"/><file name="os2editor.js" hash="107807e905cb39f178c1e349c7d89cb8"/></dir></dir></dir></target></contents>
19
<compatible/>
20
<dependencies/>
21
</package>