pitneybowes_gsp - Version 1.3.5

Version Notes

1.3.5 Release

Fixed importation charges issue on admin where charges were not being applied when using an alternative currency for customer payment.

1.3.4 Release

1. Added compatibility for Avatax version 3.x (Avatax users must request customized file from your PB account specialist)

2. Fixed issue with Importation Charges discrepancy when tax is applied to shipping.

3. Resolved a Magento 1.14 security issue with the admin path and the Category Settings top-level nav. Magento has enhanced security levels by keeping the "admin" word in the backend URL's of the admin

Version 1.3.3 Release

1. Added application logic to display the current version number for the PBGSP extension. Viewable in admin configs for the extension.

2. Fixed issue with Importation Charges discrepancy when tax is applied to shipping.

3. Applicable Importation/Tax is now visible per item ordered in the admin order detail screen.

4. Added the ability to view PB commodity error notices on checkout page. "Show Method if Not Applicable" must be set to yes in extension configs and "Ship to applicable countries" must be set to "Specific Countries", making sure US is not selected as one of the countries.

5. Fixed an issue when supress domestic leg tracking was active, it was still showing domestic tracking on customer account front-end order overview screen

Download this release

Release Info

Developer Shane Bogdan
Extension pitneybowes_gsp
Version 1.3.5
Comparing to
See all releases


Code changes from version 1.3.2 to 1.3.5

Files changed (62) hide show
  1. PBGSP_Manual_Catalog_Export.php +0 -55
  2. ReadMe.txt +0 -165
  3. app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings.php +3 -5
  4. app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings/Grid.php +3 -4
  5. app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php +4 -10
  6. app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php +6 -11
  7. app/code/local/Pb/Pbgsp/Block/Adminhtml/Version.php +19 -0
  8. app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php +4 -9
  9. app/code/local/Pb/Pbgsp/Block/Form.php +4 -9
  10. app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php +4 -10
  11. app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php +7 -13
  12. app/code/local/Pb/Pbgsp/Block/Tax/Checkout/Tax.php +21 -0
  13. app/code/local/Pb/Pbgsp/Helper/Data.php +7 -3
  14. app/code/local/Pb/Pbgsp/Model/Api.php +4 -9
  15. app/code/local/Pb/Pbgsp/Model/Authapioptions.php +0 -22
  16. app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php +53 -15
  17. app/code/local/Pb/Pbgsp/Model/Catalog/Category.php +4 -9
  18. app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php +4 -9
  19. app/code/local/Pb/Pbgsp/Model/Catalog/File.php +4 -7
  20. app/code/local/Pb/Pbgsp/Model/Catalog/Product.php +4 -9
  21. app/code/local/Pb/Pbgsp/Model/Credentials.php +4 -9
  22. app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php +4 -9
  23. app/code/local/Pb/Pbgsp/Model/Environmentconfig.php +4 -8
  24. app/code/local/Pb/Pbgsp/Model/Handlingoptions.php +4 -9
  25. app/code/local/Pb/Pbgsp/Model/Helper.php +4 -9
  26. app/code/local/Pb/Pbgsp/Model/Inboundparcel.php +5 -9
  27. app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php +4 -9
  28. app/code/local/Pb/Pbgsp/Model/Messages.php +4 -9
  29. app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php +4 -9
  30. app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php +4 -9
  31. app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php +4 -9
  32. app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php +4 -9
  33. app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php +4 -9
  34. app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php +4 -9
  35. app/code/local/Pb/Pbgsp/Model/Observer.php +37 -15
  36. app/code/local/Pb/Pbgsp/Model/Ordernumber.php +4 -9
  37. app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php +4 -9
  38. app/code/local/Pb/Pbgsp/Model/Productattributesource/Productconditions.php +3 -3
  39. app/code/local/Pb/Pbgsp/Model/Quote/Duty.php +34 -18
  40. app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php +4 -9
  41. app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php +4 -9
  42. app/code/local/Pb/Pbgsp/Model/System/Config/Backend/Serialized/Array/Priority.php +0 -46
  43. app/code/local/Pb/Pbgsp/Model/System/Config/Source/Asn.php +0 -15
  44. app/code/local/Pb/Pbgsp/Model/System/Config/Source/Auth.php +0 -15
  45. app/code/local/Pb/Pbgsp/Model/System/Config/Source/Checkout.php +0 -15
  46. app/code/local/Pb/Pbgsp/Model/System/Config/Source/Sftp.php +0 -15
  47. app/code/local/Pb/Pbgsp/Model/Util.php +16 -9
  48. app/code/local/Pb/Pbgsp/Model/Variable.php +4 -9
  49. app/code/local/Pb/Pbgsp/controllers/Adminhtml/CategorysettingsController.php +3 -3
  50. app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php +4 -7
  51. app/code/local/Pb/Pbgsp/etc/config.xml +39 -5
  52. app/code/local/Pb/Pbgsp/etc/config.xml_bk +0 -579
  53. app/code/local/Pb/Pbgsp/etc/system.xml +9 -0
  54. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php +4 -9
  55. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php +4 -9
  56. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php +4 -9
  57. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.2-1.1.3.php +0 -53
  58. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.0-1.2.1.php +4 -9
  59. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.1-1.2.2.php +0 -55
  60. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.1-1.2.4.php +0 -55
  61. app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.3.0-1.3.1.php +4 -9
  62. package.xml +26 -8
PBGSP_Manual_Catalog_Export.php DELETED
@@ -1,55 +0,0 @@
1
- <?php
2
-
3
- ini_set('display_errors', 1);
4
- error_reporting(E_ALL | E_STRICT);
5
-
6
- $mageFilename = 'app/Mage.php';
7
- require_once $mageFilename;
8
-
9
- umask(0);
10
- $mageRunCode = isset($_SERVER['MAGE_RUN_CODE']) ? $_SERVER['MAGE_RUN_CODE'] : '';
11
- $mageRunType = isset($_SERVER['MAGE_RUN_TYPE']) ? $_SERVER['MAGE_RUN_TYPE'] : 'store';
12
-
13
- Mage::app($mageRunCode, $mageRunType);
14
- //Mage::setIsDeveloperMode(true);
15
-
16
- Mage::app()->setCurrentStore(Mage_Core_Model_App::ADMIN_STORE_ID);
17
-
18
-
19
- class TestClass {
20
- public static function TestExport() {
21
- $pbExport = Mage::getModel('pb_pbgsp/catalog_cron');
22
- $pbExport->catalogSync();
23
- //$pbExport->processStatusNotifications();
24
- Mage::log('Catalog sync process completed successfully');
25
- echo 'Catalog sync process completed successfully';
26
-
27
-
28
- }
29
-
30
-
31
- public static function testProcessNotification() {
32
- $pbExport = Mage::getModel('pb_pbgsp/catalog_cron');
33
-
34
- $pbExport->processStatusNotifications();
35
- }
36
-
37
- public static function testAsnGeneration() {
38
- $pbAsnCron = Mage::getModel('pb_pbgsp/inboundparcel');
39
- $pbAsnCron->generateInboundParcelPreAdviceCron();
40
- }
41
-
42
- }
43
- if(isset($argv) && count($argv) > 1) {
44
- if($argv[1] == '1')
45
- TestClass::testProcessNotification();
46
- else if($argv[1] == '2')
47
- TestClass::testAsnGeneration();
48
- }
49
- else {
50
- TestClass::TestExport();
51
- }
52
-
53
- //
54
- ?>
55
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
ReadMe.txt DELETED
@@ -1,165 +0,0 @@
1
- ========================================================
2
- INSTALLATION
3
- ========================================================
4
- Disclaimer: We recommend to install ANY extension you purchase/download in a testing environment before deploying it to your production environment. Please also backup your Magento installation (files and database) before installing any extension and make sure no conflicting extensions are installed. All extensions are tested in clean Magento installations without third party extensions and we can't guarantee for compatibility with third party extensions.
5
-
6
- If you're using the Magento compiler - or if you are not sure if you're doing so - please log into the Magento backend and go to System > Tools > Compilation and turn it off. If you don't do so there's a good chance you'll temporarily break your Magento installation. Also, it is recommended to disable the cache before installing any extension.
7
-
8
- Open the extension ZIP file and extract it to a directory on your computer using a tool like WinRar, WinZIP or similar.
9
-
10
- Upload the extracted folders and files into the root directory of your Magento installation. The root directory of Magento is the folder that contains the directories "app", "js", "skin", "lib" and more. All folders should match the existing folder structure. If one of our extensions is already installed and you're updating it, make sure to overwrite the existing files of the extension.
11
-
12
- Go to System > Cache Management and click both the 'Flush Magento Cache' as well as the 'Flush Cache Storage' button. This is required to activate the extension.
13
-
14
- Log out of the Magento admin and log back in - you'll see a 404 Error when trying to open the configuration section if you don't log out / log in once.
15
-
16
- If you're using the Magento compiler and had it enabled before installing this extension, go to System > Tools > Compilation and click on 'Run Compilation Process' to re-compile Magento and enable it again by clicking on 'Enable'.
17
-
18
- ========================================================
19
- CONFIGURATION
20
- ========================================================
21
- Attention!! Be sure to logout & re-login before configuration else you will get '404 Error (Page not found)' in System > Configuration Page.
22
- 1> After installation go to Admin:
23
- System >> Configuration >> Shipping Methods >> Pitney Bowes PBGSP >> Manage your setting here.
24
- Be sure to review the full documentation found here http://wiki.ecommerce.pb.com
25
-
26
- Your Pitney Bowes project manager will provide you with the necessary credentials needed to complete the installation.
27
-
28
- GNUPG encryption
29
- In order to take advantage of the file encryption setting in the extension configs your server will need to have the GNUGP module installed. You can find out more about that here: https://www.gnupg.org
30
-
31
- ========================================================
32
- CHANGELOG
33
- ========================================================
34
-
35
- v. 1.3.2
36
-
37
- Check for valid Magento order for ASN generation. Fixed an issue where if there was a problem at checkout, like credit card not working, an entry was created with the PB Order # but no Magento order #. The job that generates ASN will crash when it discovers these orphaned entries. If a valid magento order number isn’t generated at the time of order, an ASN will not be generated for the order.
38
-
39
- Cleaned up the get group details functionality to remove warning notice in logs.
40
-
41
- Integrated PB in carrier list for tracking details. Customer no longer sees the "custom value" title but more accurately sees the "PB INTERNATIONAL SHIPPING" carrier.
42
-
43
-
44
-
45
- v. 1.3.1
46
-
47
- Removed the PGP encryption functionality as it is no longer required.
48
-
49
- Added a configurable value to enable/disable logging of the extension.
50
-
51
- Add "operation" logic to the catalog export file name for "delete" status
52
-
53
- Fixed issue in Magento Enterprise <=1.12 and Community <=1.7 were looking for the Varien_Data_Form_Element_Datetime object which did not exist in that version of the software. The fix uses an alternative for date time for pre-builds.
54
-
55
- Added a commodity configurable value to allow the store manager to choose the condition of the commodity (new, used, refurbished) This new value is now being passed with the catalog export.
56
-
57
- Added a custom tab on the product detail editor for PB specific content
58
-
59
- Removed addition of the PB order number as a tracking value in customer order details. PB order number is still used when a tracking number not provided when generating ASN to avoid api error.
60
-
61
-
62
-
63
- v. 1.3.0
64
-
65
- Added admin interface for managing categories to be exported in the catalog. Store managers can now quickly enable and disable categories to be exported to PB.
66
-
67
- Adjusted catalog export default preferences to 100k products
68
-
69
- Catalog file naming change when multiple files are exported per catalog. (Changed file suffix to 00001, 00002, 00003, etc)
70
-
71
- added a check if the ASN has already been generated for a shipment, do not create a new ASN if yes.
72
-
73
- Fixed error when checkout with paypal express. The lastname was not set and the PB API throws an error when last name isn't set.
74
-
75
-
76
- v. 1.2.3
77
-
78
- Fixed an issue with 3rd party checkout extensions where shipping wouldn’t show correctly when switching back and forth between US and International locations
79
-
80
- Small adjustment to force USD as the user's currency selected during the API call to PB
81
-
82
-
83
- v. 1.2.2
84
-
85
- Fixed an issue where the RH_CATEGORY_ID_PATH had a leading zero in the child category ID. This was causing duplicate categories in the PB system
86
-
87
- Created a manual catalog export tool to be used at the command line. A new file is added at magento root directory: PBGSP_Manual_Catalog_Export.php
88
-
89
-
90
- v. 1.2.1
91
-
92
- Added logic in extension preferences to change API URL values dynamically from Sandbox to Production
93
- Small adjustment to catalog product URL to use $product->getUrlInStore() .
94
-
95
- Add required logic to ensure that the ASN generation logic is triggered no matter the method of shipment creation (manual or programmatically).
96
-
97
- Fixed an error when the tracking number was not provided for the order.
98
-
99
- Added backwards compatibility to CE 1.7.x+ and Enterprise 1.8.x
100
-
101
-
102
- v. 1.2.0
103
-
104
- Add config option to override domestic shipping address with PB HUB address. When active the PB domestic HUB address will overwrite the customer shipping address for the order. The customer shipping address is stored with PB and also added to the order details for record keeping.
105
-
106
- move the product weight value into the COMMODITY_WEIGHT column on the CSV catalog exports.
107
-
108
- add logic to separate free shipping and tax. Now each work independently of one another where before enabling free shipping also made tax 0.00
109
-
110
-
111
- v. 1.1.2
112
-
113
- Integrated validation for title field in configuration page to resolve PHP 5.3 will warning when there is an empty string
114
-
115
- Added a cron job to check for shipped PB orders that have no ASNs (tracking numbers) and attempt to create.
116
-
117
-
118
- v. 1.1.1
119
-
120
- Corrected currency conversion logic to not request rate from PB but run conversion directly in Magento
121
-
122
-
123
- v. 1.1.0
124
-
125
- Added logic to cancel the order in the PB system when a PB order is cancelled in Magento.
126
-
127
- Fixed the incremental catalog/product export to only include products and/or category files when one or both are edited in magento (example: if the incremental update is set to every hour and only a single product was updated in any way during the wait period, that product will be included in the next incremental catalog update. The same is true for categories that were updated within the wait period.)
128
-
129
- Fixed an issue when empty catalog and category export csv files were created even though there were no updates made.
130
-
131
-
132
- v. 1.0.3
133
-
134
- Added compatibility to run in php 5.6.x
135
-
136
-
137
- v. 1.0.2
138
-
139
- Resolved issue where orders with shipments were not passing additional ASNs. Now an ASN is generated for each shipment per order
140
-
141
-
142
- v. 1.0.1
143
-
144
- Fixed a production issue when exportedFiles variable is null
145
- Added City to the Pitney Bowes Hub address provided to store admin on order details
146
- Update PB tracking URL to https://parceltracking.pb.com/app/#/dashboard/UPIDHERE
147
- Fixed issue with international tracking url
148
- Fixed a production issue when exportedFiles variable is null
149
- Fixed issue with ASN request not sending correct commodity quantity.
150
- Made the PGP extension not required for installation thru the Magento Connect process.
151
- Added Input values in config to allow customer return address when shipment is rejected
152
-
153
- v. 1.0.0 -
154
- - Initial Application build, see documentation for details
155
-
156
-
157
- ========================================================
158
- BUGS / NEW FEATURE REQUEST
159
- ========================================================
160
- PB-Magento-GSP-Support@pb.com
161
- #################(RAY, we can add a support email here that will be PB specific but that will also forward to my team)
162
- ========================================================
163
- FOR SUPPORT
164
- ========================================================
165
- PB-Magento-GSP-Support@pb.com
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings.php CHANGED
@@ -1,10 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
  */
9
 
10
  class Pb_Pbgsp_Block_Adminhtml_Categorysettings extends Mage_Adminhtml_Block_Widget_Grid_Container {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
6
  */
7
 
8
  class Pb_Pbgsp_Block_Adminhtml_Categorysettings extends Mage_Adminhtml_Block_Widget_Grid_Container {
app/code/local/Pb/Pbgsp/Block/Adminhtml/Categorysettings/Grid.php CHANGED
@@ -1,9 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
  */
8
 
9
  class Pb_Pbgsp_Block_Adminhtml_Categorysettings_Grid extends Mage_Adminhtml_Block_Widget_Grid {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
6
  */
7
 
8
  class Pb_Pbgsp_Block_Adminhtml_Categorysettings_Grid extends Mage_Adminhtml_Block_Widget_Grid {
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php CHANGED
@@ -1,16 +1,10 @@
1
  <?php
2
-
3
  /**
4
- * Product: Pb_Pbgsp (1.3.2)
5
- * Packaged: 2016-01-11T11:12:49+00:00
6
- * Last Modified: 2015-12-18T11:00:00+00:00
7
-
8
-
9
-
10
-
11
-
12
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php
13
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
14
  */
15
  class Pb_Pbgsp_Block_Adminhtml_Sales_Order_Invoice_Totals extends Mage_Adminhtml_Block_Sales_Order_Totals {
16
 
1
  <?php
 
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Block_Adminhtml_Sales_Order_Invoice_Totals extends Mage_Adminhtml_Block_Sales_Order_Totals {
10
 
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php CHANGED
@@ -1,16 +1,10 @@
1
  <?php
2
-
3
  /**
4
- * Product: Pb_Pbgsp (1.3.2)
5
- * Packaged: 2016-01-11T11:12:49+00:00
6
- * Last Modified: 2015-12-18T11:00:00+00:00
7
-
8
-
9
-
10
-
11
-
12
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php
13
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
14
  */
15
 
16
  class Pb_Pbgsp_Block_Adminhtml_Sales_Order_Totals extends Mage_Adminhtml_Block_Sales_Order_Totals {
@@ -21,7 +15,8 @@ class Pb_Pbgsp_Block_Adminhtml_Sales_Order_Totals extends Mage_Adminhtml_Block_S
21
 
22
  $shipMethod = $this->getOrder()->getShippingMethod();
23
  $taxAmount = $this->getOrder()->getTaxAmount();
24
- $total = Pb_Pbgsp_Block_Sales_Order_Totals::addDuties($total,$after,$shipMethod,$taxAmount);
 
25
  return parent::addTotal($total,$after);
26
 
27
  }
1
  <?php
 
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
  class Pb_Pbgsp_Block_Adminhtml_Sales_Order_Totals extends Mage_Adminhtml_Block_Sales_Order_Totals {
15
 
16
  $shipMethod = $this->getOrder()->getShippingMethod();
17
  $taxAmount = $this->getOrder()->getTaxAmount();
18
+ $taxBaseAmount = $this->getOrder()->getBaseTaxAmount();
19
+ $total = Pb_Pbgsp_Block_Sales_Order_Totals::addDuties($total,$after,$shipMethod,$taxAmount,$taxBaseAmount);
20
  return parent::addTotal($total,$after);
21
 
22
  }
app/code/local/Pb/Pbgsp/Block/Adminhtml/Version.php ADDED
@@ -0,0 +1,19 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+ /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
6
+
7
+
8
+ */
9
+
10
+
11
+
12
+ class Pb_Pbgsp_Block_Adminhtml_Version extends Mage_Adminhtml_Block_System_Config_Form_Field
13
+ {
14
+ protected function _getElementHtml(Varien_Data_Form_Element_Abstract $element)
15
+ {
16
+ return (string) Mage::helper('pbgsp')->getExtensionVersion();
17
+ }
18
+ }
19
+ ?>
app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php CHANGED
@@ -1,16 +1,11 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.3.2)
5
- * Packaged: 2016-01-11T11:12:49+00:00
6
- * Last Modified: 2015-12-18T11:00:00+00:00
7
-
8
-
9
-
10
-
11
-
12
  * File: app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php
13
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
14
  */
15
 
16
  class Pb_Pbgsp_Block_Checkout_Shipping_Method_Available extends Mage_Checkout_Block_Onepage_Shipping_Method_Available {
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.3.5)
5
+ * Packaged: 2016-04-06T13:00:10+00:00
6
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
7
  * File: app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php
8
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
10
 
11
  class Pb_Pbgsp_Block_Checkout_Shipping_Method_Available extends Mage_Checkout_Block_Onepage_Shipping_Method_Available {
app/code/local/Pb/Pbgsp/Block/Form.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Block/Form.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
 
15
  /**
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Block/Form.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
  /**
app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php CHANGED
@@ -1,16 +1,10 @@
1
  <?php
2
-
3
  /**
4
- * Product: Pb_Pbgsp (1.3.2)
5
- * Packaged: 2016-01-11T11:12:49+00:00
6
- * Last Modified: 2015-12-18T11:00:00+00:00
7
-
8
-
9
-
10
-
11
-
12
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php
13
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
14
  */
15
 
16
  class Pb_Pbgsp_Block_Sales_Order_Invoice_Totals extends Mage_Sales_Block_Order_Invoice_Totals {
1
  <?php
 
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
  class Pb_Pbgsp_Block_Sales_Order_Invoice_Totals extends Mage_Sales_Block_Order_Invoice_Totals {
app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php CHANGED
@@ -1,23 +1,16 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Block_Sales_Order_Totals extends Mage_Sales_Block_Order_Totals {
15
 
16
- public static function addDuties(Varien_Object $total, $after, $shipMethod, $taxAmount) {
17
 
18
- // TODO: This is kind of ugly. I am replacing the tax template with a tax entry...
19
- // By default this sets the block_name without parameters which loads the appropriate
20
- // template. Need to see if this breaks anything.
21
 
22
  $len = strlen("pbgsp_");
23
  if (strlen($shipMethod) > $len && substr($shipMethod,0,$len) == "pbgsp_") {
@@ -25,6 +18,7 @@ class Pb_Pbgsp_Block_Sales_Order_Totals extends Mage_Sales_Block_Order_Totals {
25
  $total = new Varien_Object(array(
26
  'code' => 'tax',
27
  'value' => $taxAmount,
 
28
  'label' => 'Importation Charges'
29
  ));
30
  }
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Block_Sales_Order_Totals extends Mage_Sales_Block_Order_Totals {
10
 
11
+ public static function addDuties(Varien_Object $total, $after, $shipMethod, $taxAmount,$taxBaseAmount) {
12
 
13
+
 
 
14
 
15
  $len = strlen("pbgsp_");
16
  if (strlen($shipMethod) > $len && substr($shipMethod,0,$len) == "pbgsp_") {
18
  $total = new Varien_Object(array(
19
  'code' => 'tax',
20
  'value' => $taxAmount,
21
+ 'base_value' => $taxBaseAmount,
22
  'label' => 'Importation Charges'
23
  ));
24
  }
app/code/local/Pb/Pbgsp/Block/Tax/Checkout/Tax.php ADDED
@@ -0,0 +1,21 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?php
2
+
3
+ /**
4
+ * Product: Pb_Pbgsp (1.3.5)
5
+ * Packaged: 2016-04-06T13:00:10+00:00
6
+ * Last Modified: 2016-03-17T11:08:10+00:00
7
+ */
8
+ class Pb_Pbgsp_Block_Tax_Checkout_Tax extends Mage_Tax_Block_Checkout_Tax
9
+ {
10
+ public function getTotal() {
11
+ $total = parent::getTotal();
12
+ if ($total->getAddress()) {
13
+ if(Pb_Pbgsp_Model_Util::isPbOrder($total->getAddress()->getShippingMethod())) {
14
+ $total->setTitle('Importation Charges');
15
+ }
16
+
17
+ }
18
+
19
+ return $total;
20
+ }
21
+ }
app/code/local/Pb/Pbgsp/Helper/Data.php CHANGED
@@ -1,12 +1,16 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
  */
8
 
9
  class Pb_Pbgsp_Helper_Data extends Mage_Core_Helper_Abstract
10
  {
 
 
 
 
11
 
12
  }
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
6
 
7
  */
8
 
9
  class Pb_Pbgsp_Helper_Data extends Mage_Core_Helper_Abstract
10
  {
11
+ public function getExtensionVersion()
12
+ {
13
+ return (string) Mage::getConfig()->getNode()->modules->Pb_Pbgsp->version;
14
+ }
15
 
16
  }
app/code/local/Pb/Pbgsp/Model/Api.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Api.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Api
15
  {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Api.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Api
10
  {
app/code/local/Pb/Pbgsp/Model/Authapioptions.php DELETED
@@ -1,22 +0,0 @@
1
- <?php
2
- /**
3
- * Product: Pb_Pbgsp (1.1.2)
4
- * Packaged: 2015-09-23T12:09:53+00:00
5
- * Last Modified: 2015-09-14T12:11:20+00:00
6
-
7
-
8
-
9
-
10
- * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
11
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
12
- */
13
- class Pb_Pbgsp_Model_Authapioptions {
14
- public function toOptionArray()
15
- {
16
- return array(
17
- array('value'=>"Auth: https://cbs.ecommerce.pb.com/auth/token", 'label'=>'Production'),
18
- array('value'=>"https://sandbox-cbs.ecommerce.pb.com/auth/token", 'label'=>'Sandbox'),
19
-
20
- );
21
- }
22
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php CHANGED
@@ -1,16 +1,10 @@
1
  <?php
2
-
3
  /**
4
- * Product: Pb_Pbgsp (1.3.2)
5
- * Packaged: 2016-01-11T11:12:49+00:00
6
- * Last Modified: 2015-12-18T11:00:00+00:00
7
-
8
-
9
-
10
-
11
-
12
  * File: app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php
13
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
14
  */
15
  class Pb_Pbgsp_Model_Carrier_ShippingMethod extends Mage_Shipping_Model_Carrier_Abstract
16
  {
@@ -188,10 +182,10 @@ class Pb_Pbgsp_Model_Carrier_ShippingMethod extends Mage_Shipping_Model_Carrier_
188
  */
189
  public function collectRates(Mage_Shipping_Model_Rate_Request $request)
190
  {
191
- Mage::getSingleton("customer/session")->setPbDutyAndTax(false);
192
 
193
- Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD(false);
194
- //Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Carrier_ShippingMethod.collectRates ' . Mage::getStoreConfig('carriers/'.$this->_code.'/active'));
195
  // skip if not enabled
196
  if (!Mage::getStoreConfig('carriers/'.$this->_code.'/active')) {
197
  return false;
@@ -301,9 +295,9 @@ class Pb_Pbgsp_Model_Carrier_ShippingMethod extends Mage_Shipping_Model_Carrier_
301
  //if($e->getMessage() == '')
302
  $message = "We've received an unexpected error while getting your quote. Please try again. If the error persists contact magentosupport@pb.com.";
303
  $this->_addError($result,$message);
304
- Mage::getSingleton("customer/session")->setPbDutyAndTax(false);
305
 
306
- Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD(false);
307
 
308
  }
309
  return $result;
@@ -326,5 +320,49 @@ class Pb_Pbgsp_Model_Carrier_ShippingMethod extends Mage_Shipping_Model_Carrier_
326
  public function isTrackingAvailable(){
327
  return true;
328
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
329
  }
330
  ?>
1
  <?php
 
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Carrier_ShippingMethod extends Mage_Shipping_Model_Carrier_Abstract
10
  {
182
  */
183
  public function collectRates(Mage_Shipping_Model_Rate_Request $request)
184
  {
185
+ Mage::getSingleton("customer/session")->setPbDutyAndTax(0);
186
 
187
+ Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD(0);
188
+ Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Carrier_ShippingMethod.collectRates ' . Mage::getStoreConfig('carriers/'.$this->_code.'/active'));
189
  // skip if not enabled
190
  if (!Mage::getStoreConfig('carriers/'.$this->_code.'/active')) {
191
  return false;
295
  //if($e->getMessage() == '')
296
  $message = "We've received an unexpected error while getting your quote. Please try again. If the error persists contact magentosupport@pb.com.";
297
  $this->_addError($result,$message);
298
+ Mage::getSingleton("customer/session")->setPbDutyAndTax(0);
299
 
300
+ Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD(0);
301
 
302
  }
303
  return $result;
320
  public function isTrackingAvailable(){
321
  return true;
322
  }
323
+
324
+ public function getTrackingInfo($tracking)
325
+ {
326
+ $track = Mage::getModel('shipping/tracking_result_status');
327
+ $track->setUrl('http://tracking.ecommerce.pb.com/track/' . $tracking.'?staging=0')
328
+ ->setTracking($tracking)
329
+ ->setCarrierTitle($this->getConfigData('name'));
330
+ return $track;
331
+ }
332
+
333
+ public function checkAvailableShipCountries(Mage_Shipping_Model_Rate_Request $request)
334
+ {
335
+ $speCountriesAllow = $this->getConfigData('sallowspecific');
336
+ /*
337
+ * for specific countries, the flag will be 1
338
+ */
339
+ if ($speCountriesAllow && $speCountriesAllow == 1){
340
+ $showMethod = $this->getConfigData('showmethod');
341
+ $availableCountries = array();
342
+ if($this->getConfigData('specificcountry')) {
343
+ $availableCountries = explode(',',$this->getConfigData('specificcountry'));
344
+ }
345
+ if ($availableCountries && in_array($request->getDestCountryId(), $availableCountries)) {
346
+ return $this;
347
+ } elseif ($showMethod && (!$availableCountries || ($availableCountries
348
+ && !in_array($request->getDestCountryId(), $availableCountries))) && ($request->getDestCountryId() != 'US')
349
+ ){
350
+ $error = Mage::getModel('shipping/rate_result_error');
351
+ $error->setCarrier($this->_code);
352
+ $error->setCarrierTitle($this->getConfigData('title'));
353
+ $errorMsg = $this->getConfigData('specificerrmsg');
354
+ $error->setErrorMessage($errorMsg ? $errorMsg : Mage::helper('shipping')->__('The shipping module is not available for selected delivery country.'));
355
+ return $error;
356
+ } else {
357
+ /*
358
+ * The admin set not to show the shipping module if the devliery country is not within specific countries
359
+ */
360
+ return false;
361
+ }
362
+ }
363
+ return $this;
364
+ }
365
+
366
+
367
  }
368
  ?>
app/code/local/Pb/Pbgsp/Model/Catalog/Category.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Category.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Catalog_Category {
15
  protected $category;
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Category.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Catalog_Category {
10
  protected $category;
app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Catalog_Cron {
15
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Catalog_Cron {
10
 
app/code/local/Pb/Pbgsp/Model/Catalog/File.php CHANGED
@@ -1,14 +1,11 @@
1
  <?php
2
 
3
  /**
4
- * Product: Pb_Pbgsp (1.3.2)
5
- * Packaged: 2016-01-11T11:12:49+00:00
6
- * Last Modified: 2015-12-18T11:00:00+00:00
7
-
8
-
9
-
10
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/File.php
11
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
12
  */
13
 
14
  class Pb_Pbgsp_Model_Catalog_File {
1
  <?php
2
 
3
  /**
4
+ * Product: Pb_Pbgsp (1.3.5)
5
+ * Packaged: 2016-04-06T13:00:10+00:00
6
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
7
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/File.php
8
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
9
  */
10
 
11
  class Pb_Pbgsp_Model_Catalog_File {
app/code/local/Pb/Pbgsp/Model/Catalog/Product.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Product.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  /**
15
  * Class Pb_Pbgsp_Model_Catalog_Product
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Catalog/Product.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  /**
10
  * Class Pb_Pbgsp_Model_Catalog_Product
app/code/local/Pb/Pbgsp/Model/Credentials.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Credentials.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Credentials {
15
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Credentials.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Credentials {
10
 
app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Creditmemo_Duty extends Mage_Sales_Model_Order_Creditmemo_Total_Tax
15
  {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Creditmemo_Duty extends Mage_Sales_Model_Order_Creditmemo_Total_Tax
10
  {
app/code/local/Pb/Pbgsp/Model/Environmentconfig.php CHANGED
@@ -1,14 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
  * File: app/code/local/Pb/Pbgsp/Model/Environmentconfig.php
11
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
12
  */
13
  class Pb_Pbgsp_Model_Environmentconfig{
14
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Environmentconfig.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Environmentconfig{
10
 
app/code/local/Pb/Pbgsp/Model/Handlingoptions.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Handlingoptions {
15
  public function toOptionArray()
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Handlingoptions {
10
  public function toOptionArray()
app/code/local/Pb/Pbgsp/Model/Helper.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Helper.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Helper {
15
  public static function displayInfo($var) {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Helper.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Helper {
10
  public static function displayInfo($var) {
app/code/local/Pb/Pbgsp/Model/Inboundparcel.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Inboundparcel.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Inboundparcel extends Mage_Core_Model_Abstract {
15
  public function _construct()
@@ -88,6 +83,7 @@ class Pb_Pbgsp_Model_Inboundparcel extends Mage_Core_Model_Abstract {
88
  ->setData('title', 'PB')
89
  ->setData('number',$parcelResponse['parcelIdentifier'])
90
  ->setData('carrier_code', 'pbgsp')
 
91
  ->setData('order_id', $shipment->getData('order_id'))
92
  ->save();
93
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Inboundparcel.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Inboundparcel extends Mage_Core_Model_Abstract {
10
  public function _construct()
83
  ->setData('title', 'PB')
84
  ->setData('number',$parcelResponse['parcelIdentifier'])
85
  ->setData('carrier_code', 'pbgsp')
86
+ ->setData('description', $cpOrderNumber)
87
  ->setData('order_id', $shipment->getData('order_id'))
88
  ->save();
89
 
app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
 
15
  class Pb_Pbgsp_Model_Invoice_Duty extends Mage_Sales_Model_Order_Invoice_Total_Tax
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
  class Pb_Pbgsp_Model_Invoice_Duty extends Mage_Sales_Model_Order_Invoice_Total_Tax
app/code/local/Pb/Pbgsp/Model/Messages.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Messages.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Messages {
15
  // protected $messages = array(
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Messages.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Messages {
10
  // protected $messages = array(
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Mysql4_Inboundparcel extends Mage_Core_Model_Mysql4_Abstract {
15
  public function _construct()
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Mysql4_Inboundparcel extends Mage_Core_Model_Mysql4_Abstract {
10
  public function _construct()
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
 
15
  class Pb_Pbgsp_Model_Mysql4_Inboundparcel_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
  class Pb_Pbgsp_Model_Mysql4_Inboundparcel_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract {
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Mysql4_Ordernumber extends Mage_Core_Model_Mysql4_Abstract {
15
  public function _construct()
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Mysql4_Ordernumber extends Mage_Core_Model_Mysql4_Abstract {
10
  public function _construct()
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Mysql4_Ordernumber_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract {
15
  public function _construct()
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Mysql4_Ordernumber_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract {
10
  public function _construct()
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Mysql4_Variable extends Mage_Core_Model_Mysql4_Abstract {
15
  public function _construct()
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Mysql4_Variable extends Mage_Core_Model_Mysql4_Abstract {
10
  public function _construct()
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Mysql4_Variable_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract {
15
  public function _construct()
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Mysql4_Variable_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract {
10
  public function _construct()
app/code/local/Pb/Pbgsp/Model/Observer.php CHANGED
@@ -1,13 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
  * File: app/code/local/Pb/Pbgsp/Model/Observer.php
10
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
11
  */
12
  class Pb_Pbgsp_Model_Observer {
13
  const MODULE_NAME = 'Pb_Pbgsp';
@@ -100,6 +97,7 @@ class Pb_Pbgsp_Model_Observer {
100
  ->setData('title', 'PB')
101
  ->setData('number',$parcelResponse['parcelIdentifier'])
102
  ->setData('carrier_code', 'pbgsp')
 
103
  ->setData('order_id', $shipment->getData('order_id'))
104
  ->save();
105
 
@@ -118,7 +116,7 @@ class Pb_Pbgsp_Model_Observer {
118
 
119
  }
120
  public function createPbOrder($observer) {
121
- // Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Observer.createPbOrder');
122
  Mage::getSingleton("customer/session")->setPbDutyAndTax(0);
123
  $mageOrderNumber = Mage::getSingleton('checkout/session')->getLastRealOrderId();
124
  $order = Mage::getModel('sales/order')->loadByIncrementId($mageOrderNumber);
@@ -221,6 +219,7 @@ class Pb_Pbgsp_Model_Observer {
221
 
222
  public function saveShippingMethod($observer) {
223
  Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Observer.saveShippingMethod');
 
224
  //TODO: If anything fails here I need to fail the checkout process.
225
  $address = $observer->getQuote()->getShippingAddress();
226
  Pb_Pbgsp_Model_Util::log($address->getShippingMethod());
@@ -234,11 +233,33 @@ class Pb_Pbgsp_Model_Observer {
234
  if (!$order) {
235
  Mage::throwException("Unable to create Pb order.");
236
  }
237
-
238
  $tax = $order['order']['totalImportation']['total']['value'];
239
 
240
  if(Pb_Pbgsp_Model_Credentials::isFreeTaxEnabled())
241
  $tax = 0;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
242
  Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD($tax);
243
  if(Mage::app()->getStore()->getCurrentCurrencyCode() != 'USD') {
244
 
@@ -263,15 +284,16 @@ class Pb_Pbgsp_Model_Observer {
263
  Mage::getSingleton("customer/session")->setPbOrderNumber($orderNumber);
264
  } else {
265
  Pb_Pbgsp_Model_Util::log(" not clearpath order");
266
- Mage::getSingleton("customer/session")->setPbDutyAndTax(false);
267
- Mage::getSingleton("customer/session")->setPbOrderNumber(false);
268
- Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD(false);
 
269
  }
270
  }
271
 
272
  public function addDutiesOnEstimation($observer){
273
- //Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Observer.addDutiesOnEstimation');
274
- Mage::getSingleton("customer/session")->setPbDutyAndTax(false);//Added by BigPixel to clear previous values, 10/20/2013
275
  $clearPathMethods = Mage::getSingleton('checkout/session')->getPbMethods();
276
  $quote = Mage::getSingleton('checkout/session')->getQuote();
277
  $selectedMethod = null;
@@ -405,7 +427,7 @@ class Pb_Pbgsp_Model_Observer {
405
  $html = str_replace("Shipping &amp; Handling","Transportation Charges",$html);
406
  $html = str_replace("Shipping & Handling","Transportation Charges",$html);
407
  $html = str_replace("Duty & Taxes","Importation Charges",$html);
408
- $html = str_replace("Duty &amp; Taxes","Importation Charges",$html);
409
  $transport['html'] = $html;
410
  }
411
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Observer.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Observer {
10
  const MODULE_NAME = 'Pb_Pbgsp';
97
  ->setData('title', 'PB')
98
  ->setData('number',$parcelResponse['parcelIdentifier'])
99
  ->setData('carrier_code', 'pbgsp')
100
+ ->setData('description',$cpOrderNumber)
101
  ->setData('order_id', $shipment->getData('order_id'))
102
  ->save();
103
 
116
 
117
  }
118
  public function createPbOrder($observer) {
119
+ Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Observer.createPbOrder');
120
  Mage::getSingleton("customer/session")->setPbDutyAndTax(0);
121
  $mageOrderNumber = Mage::getSingleton('checkout/session')->getLastRealOrderId();
122
  $order = Mage::getModel('sales/order')->loadByIncrementId($mageOrderNumber);
219
 
220
  public function saveShippingMethod($observer) {
221
  Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Observer.saveShippingMethod');
222
+
223
  //TODO: If anything fails here I need to fail the checkout process.
224
  $address = $observer->getQuote()->getShippingAddress();
225
  Pb_Pbgsp_Model_Util::log($address->getShippingMethod());
233
  if (!$order) {
234
  Mage::throwException("Unable to create Pb order.");
235
  }
236
+ Mage::getSingleton("customer/session")->setPbOrder($order);
237
  $tax = $order['order']['totalImportation']['total']['value'];
238
 
239
  if(Pb_Pbgsp_Model_Credentials::isFreeTaxEnabled())
240
  $tax = 0;
241
+ else {
242
+ //set the tax for each item in quote
243
+ // foreach($address->getAllItems() as $item) {
244
+ // /* @var Mage_Sales_Model_Quote_Item $item */
245
+ // foreach($order['order']['quoteLines'] as $quoteLine) {
246
+ // $sku = $quoteLine['merchantComRefId'];
247
+ // if($item->getSku() == $sku) {
248
+ // $itemBaseTax = $quoteLine['unitImportation']['total']['value'];
249
+ // $item->setBaseTaxAmount(floatval($itemBaseTax));
250
+ // $itemTax = $itemBaseTax;
251
+ // if(Mage::app()->getStore()->getCurrentCurrencyCode() != 'USD') {
252
+ //
253
+ // $itemTax = Mage::app()->getStore()->convertPrice($itemBaseTax);
254
+ //
255
+ // }
256
+ // $item->setTaxAmount($itemTax);
257
+ // $item->save();
258
+ // }
259
+ // }
260
+ // $address->save();
261
+ // }
262
+ }
263
  Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD($tax);
264
  if(Mage::app()->getStore()->getCurrentCurrencyCode() != 'USD') {
265
 
284
  Mage::getSingleton("customer/session")->setPbOrderNumber($orderNumber);
285
  } else {
286
  Pb_Pbgsp_Model_Util::log(" not clearpath order");
287
+ Mage::getSingleton("customer/session")->setPbDutyAndTax(0);
288
+ Mage::getSingleton("customer/session")->setPbOrderNumber(0);
289
+ Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD(0);
290
+ Mage::getSingleton("customer/session")->setPbOrder(0);
291
  }
292
  }
293
 
294
  public function addDutiesOnEstimation($observer){
295
+ Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Observer.addDutiesOnEstimation');
296
+ Mage::getSingleton("customer/session")->setPbDutyAndTax(0);//Added by BigPixel to clear previous values, 10/20/2013
297
  $clearPathMethods = Mage::getSingleton('checkout/session')->getPbMethods();
298
  $quote = Mage::getSingleton('checkout/session')->getQuote();
299
  $selectedMethod = null;
427
  $html = str_replace("Shipping &amp; Handling","Transportation Charges",$html);
428
  $html = str_replace("Shipping & Handling","Transportation Charges",$html);
429
  $html = str_replace("Duty & Taxes","Importation Charges",$html);
430
+ //$html = str_replace("Duty &amp; Taxes","Importation Charges",$html);
431
  $transport['html'] = $html;
432
  }
433
 
app/code/local/Pb/Pbgsp/Model/Ordernumber.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Ordernumber.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Ordernumber extends Mage_Core_Model_Abstract {
15
  public function _construct()
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Ordernumber.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Ordernumber extends Mage_Core_Model_Abstract {
10
  public function _construct()
app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
 
15
  class Pb_Pbgsp_Model_Pdf_Tax extends Mage_Tax_Model_Sales_Pdf_Tax {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
  class Pb_Pbgsp_Model_Pdf_Tax extends Mage_Tax_Model_Sales_Pdf_Tax {
app/code/local/Pb/Pbgsp/Model/Productattributesource/Productconditions.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
 
7
  */
8
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
6
 
7
  */
8
 
app/code/local/Pb/Pbgsp/Model/Quote/Duty.php CHANGED
@@ -1,16 +1,10 @@
1
  <?php
2
-
3
  /**
4
- * Product: Pb_Pbgsp (1.3.2)
5
- * Packaged: 2016-01-11T11:12:49+00:00
6
- * Last Modified: 2015-12-18T11:00:00+00:00
7
-
8
-
9
-
10
-
11
-
12
  * File: app/code/local/Pb/Pbgsp/Model/Quote/Duty.php
13
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
14
  */
15
 
16
  class Pb_Pbgsp_Model_Quote_Duty extends Mage_Tax_Model_Sales_Total_Quote_Tax
@@ -29,7 +23,7 @@ class Pb_Pbgsp_Model_Quote_Duty extends Mage_Tax_Model_Sales_Total_Quote_Tax
29
  }
30
 
31
  public function getDutyAndTax() {
32
- //Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Quote_Duty.getDutyAndTax');
33
  $amount = Mage::getSingleton("customer/session")->getPbDutyAndTax();
34
  if($amount) {
35
  if(Mage::app()->getStore()->getCurrentCurrencyCode() == 'USD')
@@ -47,22 +41,44 @@ class Pb_Pbgsp_Model_Quote_Duty extends Mage_Tax_Model_Sales_Total_Quote_Tax
47
  */
48
  public function collect(Mage_Sales_Model_Quote_Address $address)
49
  {
50
- //Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Quote_Duty.collect');
51
  parent::collect($address);
52
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
53
  $allowSpecific = Mage::getStoreConfig('carriers/pbgsp/sallowspecific');
54
  if($allowSpecific) {
55
  $activeCountries = Mage::getStoreConfig('carriers/pbgsp/specificcountry');
56
 
57
  if(!(strpos($activeCountries,$address->getCountryId()) !== false)) {
58
  //Pb_Pbgsp_Model_Util::log($address->getCountryId().' not found');
59
- Mage::getSingleton("customer/session")->setPbDutyAndTax(false);
60
 
61
- Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD(false);
62
  return $this;
63
  }
64
  }
65
- if ($this->getDutyAndTax()) {
66
  $items = $this->_getAddressItems($address);
67
  if (!count($items)) {
68
  return $this;
@@ -83,9 +99,9 @@ class Pb_Pbgsp_Model_Quote_Duty extends Mage_Tax_Model_Sales_Total_Quote_Tax
83
  */
84
  public function fetch(Mage_Sales_Model_Quote_Address $address)
85
  {
86
- //Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Quote_Duty.fetch');
87
  $amount = $this->getDutyAndTax();
88
- if ($amount) {
89
  if($this->dutyDisplayed) {
90
  return $this;
91
  }
1
  <?php
 
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Quote/Duty.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
  class Pb_Pbgsp_Model_Quote_Duty extends Mage_Tax_Model_Sales_Total_Quote_Tax
23
  }
24
 
25
  public function getDutyAndTax() {
26
+ Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Quote_Duty.getDutyAndTax');
27
  $amount = Mage::getSingleton("customer/session")->getPbDutyAndTax();
28
  if($amount) {
29
  if(Mage::app()->getStore()->getCurrentCurrencyCode() == 'USD')
41
  */
42
  public function collect(Mage_Sales_Model_Quote_Address $address)
43
  {
44
+ Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Quote_Duty.collect');
45
  parent::collect($address);
46
+ foreach($address->getAllItems() as $item) {
47
+ /* @var Mage_Sales_Model_Quote_Item $item */
48
+ $order = Mage::getSingleton("customer/session")->getPbOrder();
49
+ if($order) {
50
+ foreach($order['order']['quoteLines'] as $quoteLine) {
51
+ $sku = $quoteLine['merchantComRefId'];
52
+ if($item->getSku() == $sku) {
53
+ $itemBaseTax = $quoteLine['lineImportation']['total']['value'];
54
+ $item->setBaseTaxAmount(floatval($itemBaseTax));
55
+ $itemTax = $itemBaseTax;
56
+ if(Mage::app()->getStore()->getCurrentCurrencyCode() != 'USD') {
57
+
58
+ $itemTax = Mage::app()->getStore()->convertPrice($itemBaseTax);
59
+
60
+ }
61
+ $item->setTaxAmount($itemTax);
62
+ //$item->save();
63
+ }
64
+ }
65
+ }
66
+
67
+
68
+ }
69
  $allowSpecific = Mage::getStoreConfig('carriers/pbgsp/sallowspecific');
70
  if($allowSpecific) {
71
  $activeCountries = Mage::getStoreConfig('carriers/pbgsp/specificcountry');
72
 
73
  if(!(strpos($activeCountries,$address->getCountryId()) !== false)) {
74
  //Pb_Pbgsp_Model_Util::log($address->getCountryId().' not found');
75
+ Mage::getSingleton("customer/session")->setPbDutyAndTax(0);
76
 
77
+ Mage::getSingleton("customer/session")->setPbDutyAndTaxUSD(0);
78
  return $this;
79
  }
80
  }
81
+ if ($this->getDutyAndTax() && Pb_Pbgsp_Model_Util::isPbOrder($address->getShippingMethod())) {
82
  $items = $this->_getAddressItems($address);
83
  if (!count($items)) {
84
  return $this;
99
  */
100
  public function fetch(Mage_Sales_Model_Quote_Address $address)
101
  {
102
+ Pb_Pbgsp_Model_Util::log('Pb_Pbgsp_Model_Quote_Duty.fetch');
103
  $amount = $this->getDutyAndTax();
104
+ if ($amount && Pb_Pbgsp_Model_Util::isPbOrder($address->getShippingMethod())) {
105
  if($this->dutyDisplayed) {
106
  return $this;
107
  }
app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
 
15
  class Pb_Pbgsp_Model_Resource_Mysql4_Setup extends Mage_Core_Model_Resource_Setup {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
  class Pb_Pbgsp_Model_Resource_Mysql4_Setup extends Mage_Core_Model_Resource_Setup {
app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
 
15
  class Pb_Pbgsp_Model_Sales_Order_Shipment extends Mage_Sales_Model_Order_Shipment {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
  class Pb_Pbgsp_Model_Sales_Order_Shipment extends Mage_Sales_Model_Order_Shipment {
app/code/local/Pb/Pbgsp/Model/System/Config/Backend/Serialized/Array/Priority.php DELETED
@@ -1,46 +0,0 @@
1
- <?php
2
-
3
- /**
4
- * Backend for serialized array data with a priority sorting
5
- *
6
- */
7
- class Vbw_Punchout_Model_System_Config_Backend_Serialized_Array_Priority extends Mage_Adminhtml_Model_System_Config_Backend_Serialized
8
- {
9
- /**
10
- * Unset array element with '__empty' key
11
- *
12
- */
13
- protected function _beforeSave()
14
- {
15
- $value = $this->getValue();
16
- if (is_array($value)) {
17
- unset($value['__empty']);
18
- }
19
- usort($value,array($this,'sortByPriority'));
20
- $this->setValue($value);
21
- parent::_beforeSave();
22
- }
23
-
24
- /**
25
- * @param array $a
26
- * @param array $b
27
- * @return int
28
- */
29
- public function sortByPriority ($a,$b)
30
- {
31
- if (is_array($a)
32
- && is_array($b)) {
33
- if (isset($a['priority'])
34
- && isset($b['priority'])
35
- && $a['priority']!= $b['priority']) {
36
- if ($a['priority'] > $b['priority']) {
37
- return 1;
38
- } else {
39
- return -1;
40
- }
41
- }
42
- }
43
- return 0;
44
- }
45
-
46
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/Pb/Pbgsp/Model/System/Config/Source/Asn.php DELETED
@@ -1,15 +0,0 @@
1
- <?php
2
-
3
- class pb_pbgsp_model_System_Config_Source_Asn
4
- {
5
-
6
- public function toOptionArray()
7
- {
8
- return array(
9
- array('value'=>"https://cbs.ecommerce.pb.com/order-mgmt/services/v1", 'label'=>'Production'),
10
- array('value'=>"https://op-sandbox-cbs.ecommerce.pb.com/order-mgmt/services/v1", 'label'=>'Sandbox'),
11
-
12
- );
13
- }
14
-
15
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/Pb/Pbgsp/Model/System/Config/Source/Auth.php DELETED
@@ -1,15 +0,0 @@
1
- <?php
2
-
3
- class pb_pbgsp_model_System_Config_Source_Auth
4
- {
5
-
6
- public function toOptionArray()
7
- {
8
- return array(
9
- array('value'=>"Auth: https://cbs.ecommerce.pb.com/auth/token", 'label'=>'Production'),
10
- array('value'=>"https://sandbox-cbs.ecommerce.pb.com/auth/token", 'label'=>'Sandbox'),
11
-
12
- );
13
- }
14
-
15
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/Pb/Pbgsp/Model/System/Config/Source/Checkout.php DELETED
@@ -1,15 +0,0 @@
1
- <?php
2
-
3
- class pb_pbgsp_model_System_Config_Source_Checkout
4
- {
5
-
6
- public function toOptionArray()
7
- {
8
- return array(
9
- array('value'=>"https://cbs.ecommerce.pb.com/checkout/services/v1", 'label'=>'Production'),
10
- array('value'=>"https://sandbox-cbs.ecommerce.pb.com/checkout/services/v1", 'label'=>'Sandbox'),
11
-
12
- );
13
- }
14
-
15
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/Pb/Pbgsp/Model/System/Config/Source/Sftp.php DELETED
@@ -1,15 +0,0 @@
1
- <?php
2
-
3
- class pb_pbgsp_model_System_Config_Source_Sftp
4
- {
5
-
6
- public function toOptionArray()
7
- {
8
- return array(
9
- array('value'=>"sftp-cbs.ecommerce.pb.com", 'label'=>'Production'),
10
- array('value'=>"sftp-sandbox-cbs.ecommerce.pb.com", 'label'=>'Sandbox'),
11
-
12
- );
13
- }
14
-
15
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/Pb/Pbgsp/Model/Util.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Util.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Util {
15
 
@@ -41,6 +36,18 @@ class Pb_Pbgsp_Model_Util {
41
  else
42
  Mage::logException($e);
43
  }
 
 
 
 
 
 
 
 
 
 
 
 
44
  }
45
 
46
  ?>
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Util.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Util {
10
 
36
  else
37
  Mage::logException($e);
38
  }
39
+
40
+ public static function isPbOrder($shipMethod) {
41
+
42
+
43
+ $len = strlen("pbgsp_");
44
+ if (strlen($shipMethod) > $len && substr($shipMethod,0,$len) == "pbgsp_") {
45
+ return true;
46
+ }
47
+
48
+ return false;
49
+
50
+ }
51
  }
52
 
53
  ?>
app/code/local/Pb/Pbgsp/Model/Variable.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/Model/Variable.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
  class Pb_Pbgsp_Model_Variable extends Mage_Core_Model_Abstract {
15
  public function _construct()
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/Model/Variable.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
  class Pb_Pbgsp_Model_Variable extends Mage_Core_Model_Abstract {
10
  public function _construct()
app/code/local/Pb/Pbgsp/controllers/Adminhtml/CategorysettingsController.php CHANGED
@@ -1,8 +1,8 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
  */
7
 
8
  class Pb_Pbgsp_Adminhtml_CategorysettingsController extends Mage_Adminhtml_Controller_Action {
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
6
  */
7
 
8
  class Pb_Pbgsp_Adminhtml_CategorysettingsController extends Mage_Adminhtml_Controller_Action {
app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php CHANGED
@@ -1,13 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
10
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
11
  */
12
 
13
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
 
app/code/local/Pb/Pbgsp/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
- <version>1.3.1</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
@@ -27,6 +27,11 @@
27
 
28
  </rewrite>
29
  </sales>
 
 
 
 
 
30
  <adminhtml>
31
  <rewrite>
32
  <sales_order_totals>Pb_Pbgsp_Block_Adminhtml_Sales_Order_Totals</sales_order_totals>
@@ -107,7 +112,15 @@
107
  </Pb_Pbgsp_CreateParcel>
108
  </observers>
109
  </sales_order_shipment_save_after>
110
-
 
 
 
 
 
 
 
 
111
 
112
  <core_block_abstract_to_html_after>
113
  <observers>
@@ -213,6 +226,15 @@
213
  </updates>
214
  </layout>
215
  </frontend>
 
 
 
 
 
 
 
 
 
216
 
217
  <default>
218
  <carriers>
@@ -234,6 +256,7 @@
234
  <suppress_domestic_tracking>1</suppress_domestic_tracking>
235
  <notify_catalog_ok>0</notify_catalog_ok>
236
  <notify_catalog_err>1</notify_catalog_err>
 
237
  <custom_shipment_email_subject><![CDATA[{{var store.getFrontendName()}}: Shipment confirmation for Order # {{var order.increment_id}}]]>
238
  </custom_shipment_email_subject>
239
  <custom_shipment_email_template><![CDATA[<h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$order.getCustomerName()}}</h1>
@@ -489,7 +512,7 @@
489
  </jobs>
490
  </crontab>
491
 
492
- <admin>
493
  <routers>
494
  <pbgsp>
495
  <use>admin</use>
@@ -499,7 +522,18 @@
499
  </args>
500
  </pbgsp>
501
  </routers>
502
- </admin>
 
 
 
 
 
 
 
 
 
 
 
503
  <adminhtml>
504
  <events>
505
  <!--<sales_order_save_commit_after>-->
@@ -531,7 +565,7 @@
531
  <items module="pbgsp">
532
  <title>Category Settings</title>
533
  <sort_order>0</sort_order>
534
- <action>pbgsp/adminhtml_categorysettings</action>
535
  </items>
536
  </children>
537
  </pbgsp>
2
  <config>
3
  <modules>
4
  <Pb_Pbgsp>
5
+ <version>1.3.5</version>
6
  </Pb_Pbgsp>
7
  </modules>
8
  <global>
27
 
28
  </rewrite>
29
  </sales>
30
+ <tax>
31
+ <rewrite>
32
+ <checkout_tax>Pb_Pbgsp_Block_Tax_Checkout_Tax</checkout_tax>
33
+ </rewrite>
34
+ </tax>
35
  <adminhtml>
36
  <rewrite>
37
  <sales_order_totals>Pb_Pbgsp_Block_Adminhtml_Sales_Order_Totals</sales_order_totals>
112
  </Pb_Pbgsp_CreateParcel>
113
  </observers>
114
  </sales_order_shipment_save_after>
115
+ <sales_order_shipment_track_save_after>
116
+ <observers>
117
+ <Pb_Pbgsp_CreateParcel>
118
+ <type>model</type>
119
+ <class>pb_pbgsp/observer</class>
120
+ <method>salesOrderShipmentTrackSaveAfter</method>
121
+ </Pb_Pbgsp_CreateParcel>
122
+ </observers>
123
+ </sales_order_shipment_track_save_after>
124
 
125
  <core_block_abstract_to_html_after>
126
  <observers>
226
  </updates>
227
  </layout>
228
  </frontend>
229
+ <adminhtml>
230
+ <layout>
231
+ <updates>
232
+ <Pb_Pbgsp>
233
+ <file>pbgsp.xml</file>
234
+ </Pb_Pbgsp>
235
+ </updates>
236
+ </layout>
237
+ </adminhtml>
238
 
239
  <default>
240
  <carriers>
256
  <suppress_domestic_tracking>1</suppress_domestic_tracking>
257
  <notify_catalog_ok>0</notify_catalog_ok>
258
  <notify_catalog_err>1</notify_catalog_err>
259
+ <generate_asn_on_add_track>0</generate_asn_on_add_track>
260
  <custom_shipment_email_subject><![CDATA[{{var store.getFrontendName()}}: Shipment confirmation for Order # {{var order.increment_id}}]]>
261
  </custom_shipment_email_subject>
262
  <custom_shipment_email_template><![CDATA[<h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$order.getCustomerName()}}</h1>
512
  </jobs>
513
  </crontab>
514
 
515
+ <!--<admin>
516
  <routers>
517
  <pbgsp>
518
  <use>admin</use>
522
  </args>
523
  </pbgsp>
524
  </routers>
525
+ </admin>-->
526
+ <admin>
527
+ <routers>
528
+ <adminhtml>
529
+ <args>
530
+ <modules>
531
+ <Pb_Pbgsp before="Mage_Adminhtml">Pb_Pbgsp_Adminhtml</Pb_Pbgsp>
532
+ </modules>
533
+ </args>
534
+ </adminhtml>
535
+ </routers>
536
+ </admin>
537
  <adminhtml>
538
  <events>
539
  <!--<sales_order_save_commit_after>-->
565
  <items module="pbgsp">
566
  <title>Category Settings</title>
567
  <sort_order>0</sort_order>
568
+ <action>adminhtml/categorysettings</action>
569
  </items>
570
  </children>
571
  </pbgsp>
app/code/local/Pb/Pbgsp/etc/config.xml_bk DELETED
@@ -1,579 +0,0 @@
1
- <?xml version="1.0"?>
2
- <config>
3
- <modules>
4
- <Pb_Pbgsp>
5
- <version>1.3.4</version>
6
- </Pb_Pbgsp>
7
- </modules>
8
- <global>
9
- <!--<template>-->
10
- <!--<email>-->
11
- <!--<sales_email_pb_shipment_template>-->
12
- <!--<label>Pitney Bowes Custom Shipment Email</label>-->
13
- <!--<file>pbgsp_shipment_new.html</file>-->
14
- <!--<type>html</type>-->
15
- <!--</sales_email_pb_shipment_template>-->
16
- <!--</email>-->
17
- <!--</template>-->
18
-
19
- <blocks>
20
- <PB_Pbgsp>
21
- <class>Pb_Pbgsp_Block</class>
22
- </PB_Pbgsp>
23
- <sales>
24
- <rewrite>
25
- <order_totals>Pb_Pbgsp_Block_Sales_Order_Totals</order_totals>
26
- <order_invoice_totals>Pb_Pbgsp_Block_Sales_Order_Invoice_Totals</order_invoice_totals>
27
-
28
- </rewrite>
29
- </sales>
30
- <adminhtml>
31
- <rewrite>
32
- <sales_order_totals>Pb_Pbgsp_Block_Adminhtml_Sales_Order_Totals</sales_order_totals>
33
- <sales_order_invoice_totals>Pb_Pbgsp_Block_Adminhtml_Sales_Order_Invoice_Totals</sales_order_invoice_totals>
34
-
35
- </rewrite>
36
- </adminhtml>
37
- <checkout>
38
- <rewrite>
39
- <onepage_shipping_method_available>Pb_Pbgsp_Block_Checkout_Shipping_Method_Available</onepage_shipping_method_available>
40
- </rewrite>
41
- </checkout>
42
- </blocks>
43
- <models>
44
- <pb_pbgsp>
45
- <class>Pb_Pbgsp_Model</class>
46
- <resourceModel>pb_pbgsp_mysql4</resourceModel>
47
- </pb_pbgsp>
48
- <pb_pbgsp_mysql4>
49
- <class>Pb_Pbgsp_Model_Mysql4</class>
50
- <entities>
51
- <variable>
52
- <table>pbgsp_variable</table>
53
- </variable>
54
- <ordernumber>
55
- <table>pbgsp_ordernumber</table>
56
- </ordernumber>
57
- <inboundparcel>
58
- <table>pbgsp_inbound_parcel</table>
59
- </inboundparcel>
60
- </entities>
61
- </pb_pbgsp_mysql4>
62
- <sales>
63
- <rewrite>
64
- <order_invoice_total_tax>Pb_Pbgsp_Model_Invoice_Duty</order_invoice_total_tax>
65
- <order_creditmemo_total_tax>Pb_Pbgsp_Model_Creditmemo_Duty</order_creditmemo_total_tax>
66
- <order_shipment>Pb_Pbgsp_Model_Sales_Order_Shipment</order_shipment>
67
- </rewrite>
68
- </sales>
69
- </models>
70
- <resources>
71
- <pbgsp_setup>
72
- <setup>
73
- <module>Pb_Pbgsp</module>
74
- <class>Pb_Pbgsp_Model_Resource_Mysql4_Setup</class>
75
- </setup>
76
- <connection>
77
- <use>core_setup</use>
78
- </connection>
79
- </pbgsp_setup>
80
- <pb_pbgsp_write>
81
- <connection>
82
- <use>core_write</use>
83
- </connection>
84
- </pb_pbgsp_write>
85
- <pb_pbgsp_read>
86
- <connection>
87
- <use>core_read</use>
88
- </connection>
89
- </pb_pbgsp_read>
90
- </resources>
91
- <events>
92
- <!--<checkout_submit_all_after>&lt;!&ndash; added by Kamran 7/2/2014 &ndash;&gt;-->
93
- <!--<observers>-->
94
- <!--<Pb_Pbgsp_Model_CheckoutSubmitAllAfter>-->
95
- <!--<type>model</type>-->
96
- <!--<class>pb_pbgsp/observer</class>-->
97
- <!--<method>createOrderAdminAfter</method>-->
98
- <!--</Pb_Pbgsp_Model_CheckoutSubmitAllAfter>-->
99
- <!--</observers>-->
100
- <!--</checkout_submit_all_after>-->
101
- <sales_order_shipment_save_after>
102
- <observers>
103
- <Pb_Pbgsp_CreateParcel>
104
- <type>model</type>
105
- <class>pb_pbgsp/observer</class>
106
- <method>generateInboundParcelPreAdvice</method>
107
- </Pb_Pbgsp_CreateParcel>
108
- </observers>
109
- </sales_order_shipment_save_after>
110
-
111
-
112
- <core_block_abstract_to_html_after>
113
- <observers>
114
- <Pb_Pbgsp_Model_OrderView>
115
- <type>model</type>
116
- <class>pb_pbgsp/observer</class>
117
- <method>modifyOrderView</method>
118
- </Pb_Pbgsp_Model_OrderView>
119
- </observers>
120
- </core_block_abstract_to_html_after>
121
- <checkout_controller_onepage_save_shipping_method>
122
- <observers>
123
- <Pb_Pbgsp_Model_SaveShippingOne>
124
- <type>model</type>
125
- <class>pb_pbgsp/observer</class>
126
- <method>saveShippingMethod</method>
127
- </Pb_Pbgsp_Model_SaveShippingOne>
128
- </observers>
129
- </checkout_controller_onepage_save_shipping_method>
130
- <checkout_onepage_controller_success_action>
131
- <observers>
132
- <Pb_Pbgsp_Model_CheckoutCompleteOne>
133
- <type>model</type>
134
- <class>pb_pbgsp/observer</class>
135
- <method>createPbOrder</method>
136
- </Pb_Pbgsp_Model_CheckoutCompleteOne>
137
- </observers>
138
- </checkout_onepage_controller_success_action>
139
- <controller_action_postdispatch_checkout_cart_estimateUpdatePost>
140
- <observers>
141
- <Pb_Pbgsp_Estimated_Shipping>
142
- <type>model</type>
143
- <class>pb_pbgsp/observer</class>
144
- <method>addDutiesOnEstimation</method>
145
- </Pb_Pbgsp_Estimated_Shipping>
146
- </observers>
147
- </controller_action_postdispatch_checkout_cart_estimateUpdatePost>
148
- <catalog_product_load_after>
149
- <observers>
150
- <Pb_Pbgsp_Product_Last_Export>
151
- <type>model</type>
152
- <class>pb_pbgsp/observer</class>
153
- <method>productLoadAfter</method>
154
- </Pb_Pbgsp_Product_Last_Export>
155
- </observers>
156
- </catalog_product_load_after>
157
- <catalog_category_load_after>
158
- <observers>
159
- <Pb_Pbgsp_Product_Last_Export>
160
- <type>model</type>
161
- <class>pb_pbgsp/observer</class>
162
- <method>categoryLoadAfter</method>
163
- </Pb_Pbgsp_Product_Last_Export>
164
- </observers>
165
- </catalog_category_load_after>
166
- </events>
167
- <sales>
168
- <quote>
169
- <totals>
170
- <tax>
171
- <class>Pb_Pbgsp_Model_Quote_Duty</class>
172
- <before>grand_total</before>
173
- <after>shipping</after>
174
- </tax>
175
- </totals>
176
- </quote>
177
- </sales>
178
- <pdf>
179
- <totals>
180
- <tax translate="title">
181
- <title>Tax</title>
182
- <source_field>tax_amount</source_field>
183
- <model>pb_pbgsp/pdf_tax</model>
184
- <font_size>7</font_size>
185
- <display_zero>0</display_zero>
186
- <sort_order>300</sort_order>
187
- </tax>
188
- </totals>
189
- </pdf>
190
-
191
- <helpers>
192
- <pbgsp>
193
- <class>Pb_Pbgsp_Helper</class>
194
- </pbgsp>
195
-
196
- </helpers>
197
- </global>
198
- <resources>
199
- <sales_setup>
200
- <setup>
201
- <module>Pb_Pbgsp</module>
202
- <class>Pb_Pbgsp_Model_Entity_Setup</class>
203
- </setup>
204
- </sales_setup>
205
- </resources>
206
-
207
- <!--<frontend>-->
208
- <!--<layout>-->
209
- <!--<updates>-->
210
- <!--<pbcheckout>-->
211
- <!--<file>pbcheckout.xml</file>-->
212
- <!--</pbcheckout>-->
213
- <!--</updates>-->
214
- <!--</layout>-->
215
- <!--<routers>-->
216
- <!--<Pb_Pbgsp>-->
217
- <!--<use>standard</use>-->
218
- <!--<args>-->
219
- <!--<module>Pb_Pbgsp</module>-->
220
- <!--<frontName>pbgsp</frontName>-->
221
- <!--&lt;!&ndash; loads ../controller/IndexController in http://..../magento/index.php/testController &ndash;&gt;-->
222
- <!--</args>-->
223
- <!--</Pb_Pbgsp>-->
224
- <!--</routers>-->
225
- <!--<translate>-->
226
- <!--<modules>-->
227
- <!--<translations>-->
228
- <!--<files>-->
229
- <!--<default>Pb_Pbgsp.csv</default>-->
230
- <!--</files>-->
231
- <!--</translations>-->
232
- <!--</modules>-->
233
- <!--</translate>-->
234
- <!--</frontend>-->
235
-
236
- <default>
237
- <carriers>
238
- <pbgsp>
239
- <active>1</active>
240
- <sallowspecific>0</sallowspecific>
241
- <model>Pb_Pbgsp_Model_Carrier_ShippingMethod</model>
242
- <specificerrmsg>
243
- This shipping method is currently unavailable.
244
- If you would like to ship using this shipping
245
- method, please contact us.
246
- </specificerrmsg>
247
- <handling_type>F</handling_type>
248
- <catalog_diff>1</catalog_diff>
249
- <catalog_full>1</catalog_full>
250
- <catalog_size>10000</catalog_size>
251
- <catalog_encryption_enabled>0</catalog_encryption_enabled>
252
- <asn_generation_enabled>1</asn_generation_enabled>
253
- <suppress_domestic_tracking>1</suppress_domestic_tracking>
254
- <notify_catalog_ok>0</notify_catalog_ok>
255
- <notify_catalog_err>1</notify_catalog_err>
256
- <custom_shipment_email_subject><![CDATA[{{var store.getFrontendName()}}: Shipment confirmation for Order # {{var order.increment_id}}]]>
257
- </custom_shipment_email_subject>
258
- <custom_shipment_email_template><![CDATA[<h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$order.getCustomerName()}}</h1>
259
- <p style="font-size:12px; line-height:16px; margin:0;">
260
- Thank you for your order from {{var store.getFrontendName()}}.
261
- You can check the status of your order by <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">logging into your account</a>.
262
-
263
- </p>
264
- <p style="font-size:12px; line-height:16px; margin:0;">
265
- Your shipping confirmation is below. Thank you again for your business.
266
- </p></br>
267
-
268
- <h4 style="font-size:18px; font-weight:normal; margin:0;">Your Order #{{var order.increment_id}} is being shipped via Pitney Bowes to the following address
269
- </h4>
270
- <p>
271
- {{var order.getShippingAddress().format('html')}} </p>
272
-
273
- <b><i>Note: The above shipping address is not the final shipping address but it is the distribution hub address that the parcel will be sent out internationally</i></b>
274
-
275
- ]]>
276
- </custom_shipment_email_template>
277
- <separate_log_file>0</separate_log_file>
278
-
279
- <shipping_services>
280
- <POSTAL_PRIORITY>
281
- <title>Standard</title>
282
- <enabled>0</enabled>
283
- </POSTAL_PRIORITY>
284
- <FEDEX_ECONOMY>
285
- <title>Express</title>
286
- <enabled>1</enabled>
287
- </FEDEX_ECONOMY>
288
- <FEDEX_PRIORITY>
289
- <title>Express Plus</title>
290
- <enabled>1</enabled>
291
- </FEDEX_PRIORITY>
292
- <AE_STANDARD>
293
- <title>Premier</title>
294
- <enabled>1</enabled>
295
- </AE_STANDARD>
296
- <AU_STANDARD>
297
- <title>Premier</title>
298
- <enabled>1</enabled>
299
- </AU_STANDARD>
300
- <CN_STANDARD>
301
- <title>Premier</title>
302
- <enabled>1</enabled>
303
- </CN_STANDARD>
304
- <CPC_EXPRESS>
305
- <title>Premier Plus</title>
306
- <enabled>1</enabled>
307
- </CPC_EXPRESS>
308
- <CPC_STANDARD>
309
- <title>Premier</title>
310
- <enabled>1</enabled>
311
- </CPC_STANDARD>
312
- <EU_STANDARD>
313
- <title>Premier</title>
314
- <enabled>1</enabled>
315
- </EU_STANDARD>
316
- <HK_STANDARD>
317
- <title>Premier</title>
318
- <enabled>1</enabled>
319
- </HK_STANDARD>
320
- <KR_STANDARD>
321
- <title>Premier</title>
322
- <enabled>1</enabled>
323
- </KR_STANDARD>
324
- <NZ_STANDARD>
325
- <title>Premier</title>
326
- <enabled>1</enabled>
327
- </NZ_STANDARD>
328
- <PH_STANDARD>
329
- <title>Premier</title>
330
- <enabled>1</enabled>
331
- </PH_STANDARD>
332
- <SG_STANDARD>
333
- <title>Premier</title>
334
- <enabled>1</enabled>
335
- </SG_STANDARD>
336
- <TH_STANDARD>
337
- <title>Premier</title>
338
- <enabled>1</enabled>
339
- </TH_STANDARD>
340
- <TW_STANDARD>
341
- <title>Premier</title>
342
- <enabled>1</enabled>
343
- </TW_STANDARD>
344
- </shipping_services>
345
- <error_messages>
346
- <_1005001>
347
- <display>The shipping address is invalid.</display>
348
- </_1005001>
349
- <_1005002>
350
- <display>The consignee information is invalid.</display>
351
- </_1005002>
352
- <_1005003>
353
- <display>The COP transportation information is invalid.</display>
354
- </_1005003>
355
- <_1005004>
356
- <display>The requested return currency is invalid.</display>
357
- </_1005004>
358
- <_1005005>
359
- <display>The request currency is not supported for the target country.</display>
360
- </_1005005>
361
- <_1005006>
362
- <display>The order cannot be shipped by the method selected.</display>
363
- </_1005006>
364
- <_1005007>
365
- <display>The order value has exceeded the allowed value.</display>
366
- </_1005007>
367
- <_1005008>
368
- <display>Invalid fields in parcels.</display>
369
- </_1005008>
370
- <_1005009>
371
- <display>Invalid fields in commoditySources.</display>
372
- </_1005009>
373
- <_1005010>
374
- <display>This basket is over the dollar value for international shipping. Please remove some items before proceeding.</display>
375
- </_1005010>
376
- <_1005011>
377
- <display>There are errors at the Quote Item Level.</display>
378
- </_1005011>
379
- <_1005012>
380
- <display>The order exceeded the weight limit.</display>
381
- </_1005012>
382
- <_1005013>
383
- <display>The shipping address has missing fields.</display>
384
- </_1005013>
385
- <_1005014>
386
- <display>Missing fields in basket.</display>
387
- </_1005014>
388
- <_1005015>
389
- <display>Invalid fields in basket.</display>
390
- </_1005015>
391
- <_1005016>
392
- <display>The consignee information is missing.</display>
393
- </_1005016>
394
- <_1005017>
395
- <display>The COP transportation information is missing.</display>
396
- </_1005017>
397
- <_1005018>
398
- <display>Shipping Speed unavailable.</display>
399
- </_1005018>
400
- <_1005018>
401
- <display>Shipping Speed unavailable.</display>
402
- </_1005018>
403
- <_1005019>
404
- <display>Missing Basket.</display>
405
- </_1005019>
406
- <_1005020>
407
- <display>Missing Parcel Fields.</display>
408
- </_1005020>
409
- <_1005021>
410
- <display>Missing fields in the basket commodity source.</display>
411
- </_1005021>
412
- <_1005022>
413
- <display>Invalid Parcel Fields.</display>
414
- </_1005022>
415
- <_1006001>
416
- <display>The commodity was invalid.</display>
417
- </_1006001>
418
- <_1006002>
419
- <display>The commodity is too large to ship (length, width or height).</display>
420
- </_1006002>
421
- <_1006003>
422
- <display>The commodity cannot be shipped to the COD.</display>
423
- </_1006003>
424
- <_1006004>
425
- <display>The commodity has a negative price.</display>
426
- </_1006004>
427
- <_1006005>
428
- <display>The commodity’s price was too low and did not have a dutiable value.</display>
429
- </_1006005>
430
- <_1006006>
431
- <display>The item price exceeds maximum.</display>
432
- </_1006006>
433
- <_1006007>
434
- <display>Item weight exceeds maximum.</display>
435
- </_1006007>
436
- <_1006008>
437
- <display>Invalid commodity rated data. Commodity cannot be shipped at this time. This is an internal error and should be raised to PB immediately. .</display>
438
- </_1006008>
439
- <_1006009>
440
- <display>The Commodity is restricted for this Country of Destination.</display>
441
- </_1006009>
442
- <_10060010>
443
- <display>Commodity cannot be quoted.</display>
444
- </_10060010>
445
- <_10060011>
446
- <display>Commodity cannot shipped to the address specified.</display>
447
- </_10060011>
448
- <_1007001>
449
- <display>Order value exceeded on this line.</display>
450
- </_1007001>
451
- <_1007002>
452
- <display>Line too large to ship (length, width or height of the shipping box).</display>
453
- </_1007002>
454
- <_1007003>
455
- <display>The quantity is invalid or missing.</display>
456
- </_1007003>
457
- <_1007004>
458
- <display>Weight Value exceeded on this line.</display>
459
- </_1007004>
460
- <_1007005>
461
- <display>Errors in the kitContents.</display>
462
- </_1007005>
463
- <_1007006>
464
- <display>Missing fields in basket line.</display>
465
- </_1007006>
466
- <_1007007>
467
- <display>Invalid fields in basket line.</display>
468
- </_1007007>
469
- <_1007008>
470
- <display>Quantity exceeded for Country of Destination.</display>
471
- </_1007008>
472
- </error_messages>
473
- </pbgsp>
474
- </carriers>
475
- </default>
476
-
477
- <!-- Please modify this part for CRON JOB
478
- For more information on Magento Cron Job, please visit the following url:
479
- http://www.magentocommerce.com/wiki/1_-_installation_and_configuration/how_to_setup_a_cron_job#built-in_cron_jobs
480
- -->
481
- <crontab>
482
- <jobs>
483
- <pb_pbgsp>
484
- <schedule>
485
- <cron_expr>30 * * * *</cron_expr>
486
- </schedule>
487
- <run>
488
- <model>pb_pbgsp/catalog_cron::catalogSync</model>
489
- </run>
490
- </pb_pbgsp>
491
- <pb_notifications>
492
- <schedule>
493
- <cron_expr>20 * * * *</cron_expr>
494
- </schedule>
495
- <run>
496
- <model>pb_pbgsp/catalog_cron::processStatusNotifications</model>
497
- </run>
498
- </pb_notifications>
499
-
500
- <pb_generateASN>
501
- <schedule>
502
- <cron_expr>0 * * * *</cron_expr>
503
- </schedule>
504
- <run>
505
- <model>pb_pbgsp/Inboundparcel::generateInboundParcelPreAdviceCron</model>
506
- </run>
507
- </pb_generateASN>
508
- </jobs>
509
- </crontab>
510
-
511
- <admin>
512
- <routers>
513
- <pbgsp>
514
- <use>admin</use>
515
- <args>
516
- <module>Pb_Pbgsp</module>
517
- <frontName>pbgsp</frontName>
518
- </args>
519
- </pbgsp>
520
- </routers>
521
- </admin>
522
- <adminhtml>
523
- <events>
524
- <!--<sales_order_save_commit_after>-->
525
- <!--<observers>-->
526
- <!--<Pb_Pbgsp_CreateParcel>-->
527
- <!--<type>model</type>-->
528
- <!--<class>pb_pbgsp/observer</class>-->
529
- <!--<method>generateInboundParcelPreAdvice</method>-->
530
- <!--</Pb_Pbgsp_CreateParcel>-->
531
- <!--</observers>-->
532
- <!--</sales_order_save_commit_after>-->
533
-
534
- <order_cancel_after>
535
- <observers>
536
- <Pb_Pbgsp_CreateParcel>
537
- <type>model</type>
538
- <class>pb_pbgsp/observer</class>
539
- <method>cancelPbOrder</method>
540
- </Pb_Pbgsp_CreateParcel>
541
- </observers>
542
- </order_cancel_after>
543
- </events>
544
-
545
- <menu>
546
- <pbgsp module="pbgsp">
547
- <title>PBGSP</title>
548
- <sort_order>71</sort_order>
549
- <children>
550
- <items module="pbgsp">
551
- <title>Category Settings</title>
552
- <sort_order>0</sort_order>
553
- <action>pbgsp/adminhtml_categorysettings</action>
554
- </items>
555
- </children>
556
- </pbgsp>
557
- </menu>
558
- <acl>
559
- <resources>
560
- <all>
561
- <title>Allow Everything</title>
562
- </all>
563
- <admin>
564
- <children>
565
- <Pb_Pbgsp>
566
- <title>PBGSP Module</title>
567
- <sort_order>10</sort_order>
568
- </Pb_Pbgsp>
569
- </children>
570
- </admin>
571
- </resources>
572
- </acl>
573
-
574
-
575
-
576
- </adminhtml>
577
-
578
- </config>
579
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/Pb/Pbgsp/etc/system.xml CHANGED
@@ -11,6 +11,15 @@
11
  <show_in_website>1</show_in_website>
12
  <show_in_store>1</show_in_store>
13
  <fields>
 
 
 
 
 
 
 
 
 
14
  <active translate="label">
15
  <label>Enabled</label>
16
  <frontend_type>select</frontend_type>
11
  <show_in_website>1</show_in_website>
12
  <show_in_store>1</show_in_store>
13
  <fields>
14
+ <version translate="label">
15
+ <label>PBGSP version installed</label>
16
+ <frontend_type>select</frontend_type>
17
+ <frontend_model>Pb_Pbgsp_Block_Adminhtml_Version</frontend_model>
18
+ <sort_order>0</sort_order>
19
+ <show_in_default>1</show_in_default>
20
+ <show_in_website>1</show_in_website>
21
+ <show_in_store>1</show_in_store>
22
+ </version>
23
  <active translate="label">
24
  <label>Enabled</label>
25
  <frontend_type>select</frontend_type>
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
 
15
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
 
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
 
15
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
 
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
 
15
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
 
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.2-1.1.3.php DELETED
@@ -1,53 +0,0 @@
1
- <?php
2
- /**
3
- * Product: Pb_Pbgsp (1.2.0)
4
- * Packaged: 2015-10-01T12:11:15+00:00
5
- * Last Modified: 2015-09-14T12:11:20+00:00
6
-
7
-
8
-
9
-
10
- * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
11
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
12
- */
13
-
14
-
15
- $installer = $this;
16
-
17
- $installer->startSetup();
18
- $versionInfo = Mage::getVersionInfo();
19
- $version = floatval($versionInfo['major'].'.'.$versionInfo['minor']);
20
- if(Mage::getEdition() == Mage::EDITION_COMMUNITY && $version <= 1.7) {
21
- $eav = Mage::getResourceModel('catalog/setup', 'catalog_setup');//new Mage_Eav_Model_Entity_Setup('catalog_setup');
22
- $eav->removeAttribute('catalog_product','pb_pbgsp_upload');
23
- $eav->addAttribute('catalog_product', 'pb_pbgsp_upload', array(
24
- 'type' => 'int',
25
- 'input' => 'text',
26
- 'label' => 'Last PBGSP upload timestampt',
27
- 'global' => 2,
28
- 'user_defined' => 0,
29
- 'required' => 0,
30
- 'visible' => 1,
31
- 'default' => 0
32
-
33
- ));
34
- $eav->removeAttribute('catalog_category','pb_pbgsp_upload');
35
- $eav->addAttribute('catalog_category', 'pb_pbgsp_upload', array(
36
- 'type' => 'int',
37
- 'input' => 'text',
38
- 'label' => 'Last PBGSP upload timestampt',
39
- 'global' => 2,
40
- 'user_defined' => 0,
41
- 'required' => 0,
42
- 'visible' => 1,
43
- 'default' => 0,
44
- 'group' => 'PBGSP'
45
-
46
- ));
47
-
48
-
49
- }
50
-
51
-
52
- $installer->endSetup();
53
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.0-1.2.1.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
 
15
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
 
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.1-1.2.2.php DELETED
@@ -1,55 +0,0 @@
1
- <?php
2
- /**
3
- * Product: Pb_Pbgsp (1.2.2)
4
- * Packaged: 2015-10-21T12:09:20+00:00
5
- * Last Modified: 2015-10-07T12:08:45+00:00
6
-
7
-
8
-
9
-
10
-
11
- * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
- */
14
-
15
-
16
- $installer = $this;
17
-
18
- $installer->startSetup();
19
-
20
-
21
- $eav = Mage::getResourceModel('catalog/setup', 'catalog_setup');
22
-
23
- $eav->removeAttribute('catalog_product','pb_pbgsp_upload_active');
24
- $eav->addAttribute('catalog_product', 'pb_pbgsp_upload_active', array(
25
- 'type' => 'int',
26
- 'input' => 'select',
27
- 'label' => 'Export to PBGSP',
28
- 'source' => 'eav/entity_attribute_source_boolean',
29
- 'global' => 2,
30
- 'user_defined' => 0,
31
- 'required' => 0,
32
- 'visible' => 1,
33
- 'default' => 1,
34
- 'group' => 'PBGSP'
35
-
36
- ));
37
-
38
- $eav->removeAttribute('catalog_product','pb_pbgsp_upload_delete');
39
- $eav->addAttribute('catalog_product', 'pb_pbgsp_upload_delete', array(
40
- 'type' => 'int',
41
- 'input' => 'select',
42
- 'label' => 'Delete from PBGSP',
43
- 'source' => 'eav/entity_attribute_source_boolean',
44
- 'global' => 2,
45
- 'user_defined' => 0,
46
- 'required' => 0,
47
- 'visible' => 1,
48
- 'default' => 1,
49
- 'group' => 'PBGSP'
50
-
51
- ));
52
-
53
-
54
- $installer->endSetup();
55
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.1-1.2.4.php DELETED
@@ -1,55 +0,0 @@
1
- <?php
2
- /**
3
- * Product: Pb_Pbgsp (1.2.2)
4
- * Packaged: 2015-10-21T12:09:20+00:00
5
- * Last Modified: 2015-10-07T12:08:45+00:00
6
-
7
-
8
-
9
-
10
-
11
- * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
- */
14
-
15
-
16
- $installer = $this;
17
-
18
- $installer->startSetup();
19
-
20
-
21
- $eav = Mage::getResourceModel('catalog/setup', 'catalog_setup');
22
-
23
- $eav->removeAttribute('catalog_product','pb_pbgsp_upload_active');
24
- $eav->addAttribute('catalog_product', 'pb_pbgsp_upload_active', array(
25
- 'type' => 'int',
26
- 'input' => 'select',
27
- 'label' => 'Export to PBGSP',
28
- 'source' => 'eav/entity_attribute_source_boolean',
29
- 'global' => 2,
30
- 'user_defined' => 0,
31
- 'required' => 0,
32
- 'visible' => 1,
33
- 'default' => 1,
34
-
35
-
36
- ));
37
-
38
- $eav->removeAttribute('catalog_product','pb_pbgsp_upload_delete');
39
- $eav->addAttribute('catalog_product', 'pb_pbgsp_upload_delete', array(
40
- 'type' => 'int',
41
- 'input' => 'select',
42
- 'label' => 'Delete from PBGSP',
43
- 'source' => 'eav/entity_attribute_source_boolean',
44
- 'global' => 2,
45
- 'user_defined' => 0,
46
- 'required' => 0,
47
- 'visible' => 1,
48
- 'default' => 1,
49
-
50
-
51
- ));
52
-
53
-
54
- $installer->endSetup();
55
- ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.3.0-1.3.1.php CHANGED
@@ -1,15 +1,10 @@
1
  <?php
2
  /**
3
- * Product: Pb_Pbgsp (1.3.2)
4
- * Packaged: 2016-01-11T11:12:49+00:00
5
- * Last Modified: 2015-12-18T11:00:00+00:00
6
-
7
-
8
-
9
-
10
-
11
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
12
- * Copyright: Copyright (c) 2015 Pitney Bowes <info@pb.com> / All rights reserved.
13
  */
14
 
15
 
1
  <?php
2
  /**
3
+ * Product: Pb_Pbgsp (1.3.5)
4
+ * Packaged: 2016-04-06T13:00:10+00:00
5
+ * Last Modified: 2016-03-17T11:08:10+00:00
 
 
 
 
 
6
  * File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
7
+ * Copyright: Copyright (c) 2016 Pitney Bowes <info@pb.com> / All rights reserved.
8
  */
9
 
10
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
- <name>pitneybowes_gsp</name>
4
- <version>1.3.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
@@ -22,15 +22,33 @@ Providing full international tracking linked from your admin page&#xD;
22
  &lt;/ul&gt;&#xD;
23
  To learn more, go to &lt;a href="http://www.pb.com/ecom"&gt;http://www.pb.com/ecom&lt;/a&gt;&#xD;
24
  </description>
25
- <notes>1. Check for valid Magento order for ASN generation. Fixed an issue where if there was a problem at checkout, like credit card not working, an entry was created with the PB Order # but no Magento order #. The job that generates ASN will crash when it discovers these orphaned entries. If a valid magento order number isn&#x2019;t generated at the time of order, an ASN will not be generated for the order.&#xD;
26
  &#xD;
27
- 2. Cleaned up the get group details functionality to remove warning notice in logs.&#xD;
28
  &#xD;
29
- 3. Integrated PB in carrier list for tracking details. Customer no longer sees the "custom value" title but more accurately sees the "PB INTERNATIONAL SHIPPING" carrier.</notes>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
30
  <authors><author><name>Shane Bogdan</name><user>pbecommerce</user><email>shane.bogdan@pb.com</email></author></authors>
31
- <date>2016-01-14</date>
32
- <time>18:57:05</time>
33
- <contents><target name="magelocal"><dir name="Pb"><dir name="Pbgsp"><dir name="Block"><dir name="Adminhtml"><dir name="Categorysettings"><file name="Grid.php" hash="40ee8e7da18c57b9e33b4afc5b72c521"/></dir><file name="Categorysettings.php" hash="f5853197a934165be004a5b74a4d6e21"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="5f854c05b15d361105b311a4256bbbd5"/></dir><file name="Totals.php" hash="63e1df60b5e721979eebae501b8a9d6b"/></dir></dir></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="09ac83ec5824aff5d69f341c51ffe9e6"/></dir></dir></dir><file name="Form.php" hash="4fd9043e764f00378715d9509b1fb996"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="3e6c23efde4c654cc186fe0e812293f3"/></dir><file name="Totals.php" hash="4b8a9a8887790a6975a146070e921dde"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="de25b57574195d605184bf7a07ed68fe"/></dir><dir name="Model"><file name="Api.php" hash="4dc6c6cc0c63140d8a4624bd28e47552"/><file name="Authapioptions.php" hash="8cd4e0e89c1bc6b5ca12d502386c89a2"/><dir name="Carrier"><file name="ShippingMethod.php" hash="bedc447a02ed80c0ac0a815ab6f2ba64"/></dir><dir name="Catalog"><file name="Category.php" hash="f2868d99cc52432da195b2d0d4b3793d"/><file name="Cron.php" hash="d865fd2b7c23e6c08392f2c28c72aef7"/><file name="File.php" hash="4752fd0ddd2532aa450c2e0ea08c3586"/><file name="Product.php" hash="08575c850733883abc2566d87c954544"/></dir><file name="Credentials.php" hash="505e466f6dcf4d578b704798bffe5edd"/><dir name="Creditmemo"><file name="Duty.php" hash="0b15a424b661a1fe93b72dd909694aa1"/></dir><file name="Environmentconfig.php" hash="fdc1af6fd2c098a0cacbf104393e5497"/><file name="Handlingoptions.php" hash="e359e4d8746d835ec7945e522dcbbee9"/><file name="Helper.php" hash="f508afa7d5b5daf6eb9ccc872374d6e7"/><file name="Inboundparcel.php" hash="fe88eb0db1fb54066400adb6aaec791d"/><dir name="Invoice"><file name="Duty.php" hash="5c71233abfde9419675188cdb429853e"/></dir><file name="Messages.php" hash="be91063169d0fef19ca4fbc20fd61b42"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="523cd2489551265f2dd2f889101c27a5"/></dir><file name="Inboundparcel.php" hash="e36b0d40041127e4e80bdd201e59741b"/><dir name="Ordernumber"><file name="Collection.php" hash="405606c2b28818c7b5bf23393bf7779a"/></dir><file name="Ordernumber.php" hash="6f07374bfcbc40743d3dac5747e30c2c"/><dir name="Variable"><file name="Collection.php" hash="e19115324583201857eeeba1d7d76b3d"/></dir><file name="Variable.php" hash="1207a719a710475ca79d01785c3ba158"/></dir><file name="Observer.php" hash="b372cf19e1f5be836c3ced429c85c141"/><file name="Ordernumber.php" hash="20ae4139a6e63de103f8b157bd455107"/><dir name="Pdf"><file name="Tax.php" hash="80ca0d4b15101f9d5bb612383585a0e5"/></dir><dir name="Productattributesource"><file name="Productconditions.php" hash="23495b314815a4a5dc3c220661aa2604"/></dir><dir name="Quote"><file name="Duty.php" hash="5cbe7f827568d10ff7737dbc5e6dc358"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="4997a8371f1defa2b5bf2aaa3ef76afd"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="bfc999a2e3a6f3f3003be34ecfe3a66a"/></dir></dir><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Serialized"><dir name="Array"><file name="Priority.php" hash="26e62a8cc666a3ad4876863d3a89eca6"/></dir></dir></dir><dir name="Source"><file name="Asn.php" hash="e47d7eb5b42b936ee52eaedd5647f346"/><file name="Auth.php" hash="0b957b35f4d4f0746811447bf895b6b8"/><file name="Checkout.php" hash="63dc3a4a4743c960c28ab137bce515b0"/><file name="Sftp.php" hash="de167bb7276da8899d3c648c20ed0acc"/></dir></dir></dir><file name="Util.php" hash="980967e983645d987cb1c1ad90a905c1"/><file name="Variable.php" hash="c1c12dc063dbba692e6ccc2de527aef4"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="CategorysettingsController.php" hash="16c04dd845110960a54d24487856952d"/></dir></dir><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="e2b4d5c373058bc45bf7983f8f491fd5"/></dir></dir><dir name="etc"><file name="config.xml" hash="e1974b9a71ac9796054cc4321166095f"/><file name="config.xml_bk" hash="c5badd43bf052dacfe869455c724d7da"/><file name="system.xml" hash="b0fbe24adc5481836223ae8f0817f94a"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="6c8a4f5a1b82df19ee22276a5d140dc9"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="a869fc1c6538c16b346d16d70a666bf3"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="c3b4708bd62b75fd777b936f6260be83"/><file name="mysql4-upgrade-1.1.2-1.1.3.php" hash="1d3782eaf4b97b76610e0248bb938c3b"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="ec11da391ee7a1d3898bb246843aad47"/><file name="mysql4-upgrade-1.2.1-1.2.2.php" hash="4f7c435f922988778b5b264c622054b5"/><file name="mysql4-upgrade-1.2.1-1.2.4.php" hash="6dfe95296330dc6beb4110f415580526"/><file name="mysql4-upgrade-1.3.0-1.3.1.php" hash="58781ae5c9ee90713a333b340815d695"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Pb_Pbgsp.xml" hash="8475d60d4719f8ea7761a4ca39016e48"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Pb_Clearpath.csv" hash="aa4b7a650feb1709a34b6c053b56811c"/><dir name="template"><dir name="email"><file name="pbgsp_shipment_new.html" hash="0fb628e37654a9768babe0ed06df4960"/></dir></dir></dir></target><target name="mageweb"><dir name="."><file name="ReadMe.txt" hash="b52f37efd81b8a7a0ffe57ff56313f87"/><file name="PBGSP_Manual_Catalog_Export.php" hash="4be83b279be7e89c3f3cb6bfa5d0a140"/></dir></target></contents>
34
  <compatible/>
35
  <dependencies><required><php><min>5.1.0</min><max>5.6.0</max></php></required></dependencies>
36
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
+ <name>Pitney_Bowes_GSP</name>
4
+ <version>1.3.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
7
  <channel>community</channel>
22
  &lt;/ul&gt;&#xD;
23
  To learn more, go to &lt;a href="http://www.pb.com/ecom"&gt;http://www.pb.com/ecom&lt;/a&gt;&#xD;
24
  </description>
25
+ <notes>1.3.5 Release&#xD;
26
  &#xD;
27
+ Fixed importation charges issue on admin where charges were not being applied when using an alternative currency for customer payment.&#xD;
28
  &#xD;
29
+ 1.3.4 Release&#xD;
30
+ &#xD;
31
+ 1. Added compatibility for Avatax version 3.x (Avatax users must request customized file from your PB account specialist)&#xD;
32
+ &#xD;
33
+ 2. Fixed issue with Importation Charges discrepancy when tax is applied to shipping.&#xD;
34
+ &#xD;
35
+ 3. Resolved a Magento 1.14 security issue with the admin path and the Category Settings top-level nav. Magento has enhanced security levels by keeping the "admin" word in the backend URL's of the admin&#xD;
36
+ &#xD;
37
+ Version 1.3.3 Release&#xD;
38
+ &#xD;
39
+ 1. Added application logic to display the current version number for the PBGSP extension. Viewable in admin configs for the extension.&#xD;
40
+ &#xD;
41
+ 2. Fixed issue with Importation Charges discrepancy when tax is applied to shipping.&#xD;
42
+ &#xD;
43
+ 3. Applicable Importation/Tax is now visible per item ordered in the admin order detail screen.&#xD;
44
+ &#xD;
45
+ 4. Added the ability to view PB commodity error notices on checkout page. "Show Method if Not Applicable" must be set to yes in extension configs and "Ship to applicable countries" must be set to "Specific Countries", making sure US is not selected as one of the countries.&#xD;
46
+ &#xD;
47
+ 5. Fixed an issue when supress domestic leg tracking was active, it was still showing domestic tracking on customer account front-end order overview screen</notes>
48
  <authors><author><name>Shane Bogdan</name><user>pbecommerce</user><email>shane.bogdan@pb.com</email></author></authors>
49
+ <date>2016-04-11</date>
50
+ <time>19:04:50</time>
51
+ <contents><target name="magelocal"><dir name="Pb"><dir name="Pbgsp"><dir name="Block"><dir name="Adminhtml"><dir name="Categorysettings"><file name="Grid.php" hash="004a69f2441024d393d3ed172d3c87a0"/></dir><file name="Categorysettings.php" hash="658ebb13331c55df3dd6f34f90102fdc"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="39b03ff908d00a1c4d58e93e108129f5"/></dir><file name="Totals.php" hash="42bfa5d6c13c9db8651a5ef19acfcdc8"/></dir></dir><file name="Version.php" hash="4c5c63db65e6fc6322e68e237371788c"/></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="f62967eda356b67d07b27f01b541a60a"/></dir></dir></dir><file name="Form.php" hash="6816294d14bfcbf6e355da1ba3c4ae3f"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="55ec5f0248a3cf0d36154553428ef1c4"/></dir><file name="Totals.php" hash="43e45ce37e23679b59e650718897c922"/></dir></dir><dir name="Tax"><dir name="Checkout"><file name="Tax.php" hash="3801cc0b5f11f7bb45e8e0e7dda0f841"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="986e066c6c63a548f7d398274d5dd200"/></dir><dir name="Model"><file name="Api.php" hash="36703decbd09a10e124b8bbae75c93da"/><dir name="Carrier"><file name="ShippingMethod.php" hash="d26679c25a6b85896758fae4bdfb3680"/></dir><dir name="Catalog"><file name="Category.php" hash="bcfaf0fffaaf943b5a6802abac84ef77"/><file name="Cron.php" hash="f020c8378158751ffcc2facd64e0720e"/><file name="File.php" hash="768800b422a8f94157d7c260bbceaffb"/><file name="Product.php" hash="9459bbba43cc21fabfc5ad4c5072f832"/></dir><file name="Credentials.php" hash="dca53fbce09f102e93fd31e726a02894"/><dir name="Creditmemo"><file name="Duty.php" hash="8582a379b780d9424ef8ea2309c081f2"/></dir><file name="Environmentconfig.php" hash="0b0b9510ac24bc9ff32fe8f05eee42df"/><file name="Handlingoptions.php" hash="8801990bd32f91164a5822309474d6df"/><file name="Helper.php" hash="159c92ff4868e8eb7b8644fc0ec52b89"/><file name="Inboundparcel.php" hash="d4e0877d93556f8dd26a20d0e129a5a2"/><dir name="Invoice"><file name="Duty.php" hash="f9fda8c020420a3279fafa87cce91947"/></dir><file name="Messages.php" hash="10756559da4ac72dc5710b580209ec5f"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="6621707b8a53f7c88131535e3ecf3baf"/></dir><file name="Inboundparcel.php" hash="3d88e5911a87832aa64c335777c31438"/><dir name="Ordernumber"><file name="Collection.php" hash="5d3d951c440b6affb4f6e9a287536428"/></dir><file name="Ordernumber.php" hash="53546ae80ef9c1323a2a4d07f2a8ac06"/><dir name="Variable"><file name="Collection.php" hash="9f5b7a7389f0196b19588941d3dd257e"/></dir><file name="Variable.php" hash="9df5b9feaa46b3106cfdf67b9f39f7c7"/></dir><file name="Observer.php" hash="a4d3fe04d54604df33e7f6f558c64023"/><file name="Ordernumber.php" hash="d550d5320118f4996708cc52c4c0be38"/><dir name="Pdf"><file name="Tax.php" hash="64b93822fb069be8f1a0e68d7124862e"/></dir><dir name="Productattributesource"><file name="Productconditions.php" hash="56ad0bc84df9439ebc242c51a04db6f8"/></dir><dir name="Quote"><file name="Duty.php" hash="5facdacca13060be7efc17d46ef30d90"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="5f8cfc63f72f9c7ddda957b7bc04699e"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="12fb982c89c19de67375673e7a7e48da"/></dir></dir><file name="Util.php" hash="88aebd9578b806ed7e0d104d2a4f2463"/><file name="Variable.php" hash="ba34515954c497dc4dc89510974646e8"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="CategorysettingsController.php" hash="3573cdc79928be052b5776f57ab48f4f"/></dir></dir><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="029e760a3b8d8c7b8c6feceb22812427"/></dir></dir><dir name="etc"><file name="config.xml" hash="1f554cd1e056281be84e013df3398c1f"/><file name="system.xml" hash="ce3fcc56d889c8c338dc190c1967110b"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="354c4f956ded56b12c4496b0e8552f30"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="d97a309f436788cb2933f232276cfdcd"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="88bd4bc854dddd88632c24bfb937a6a8"/><file name="mysql4-upgrade-1.2.0-1.2.1.php" hash="abc675415c198039539dd9aa5562c4fc"/><file name="mysql4-upgrade-1.3.0-1.3.1.php" hash="6800c70c828d3cf3551fe64d6d69b245"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Pb_Pbgsp.xml" hash="8475d60d4719f8ea7761a4ca39016e48"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Pb_Clearpath.csv" hash="aa4b7a650feb1709a34b6c053b56811c"/><dir name="template"><dir name="email"><file name="pbgsp_shipment_new.html" hash="0fb628e37654a9768babe0ed06df4960"/></dir></dir></dir></target><target name="mageweb"><dir name="."><file name="ReadMe.txt" hash=""/><file name="PBGSP_Manual_Catalog_Export.php" hash=""/></dir></target></contents>
52
  <compatible/>
53
  <dependencies><required><php><min>5.1.0</min><max>5.6.0</max></php></required></dependencies>
54
  </package>