Version Notes
Patch release for Magento Connect.
1. Added logic in extension preferences to change API URL values dynamically from Sandbox to Production
2. Small adjustment to catalog product URL to use $product->getUrlInStore() .
3. Add required logic to ensure that the ASN generation logic is triggered no matter the method of shipment creation (manual or programmatically).
4. Fixed an error when the tracking number was not provided for the order.
5. Added backwards compatibility to CE 1.7.x+ and Enterprise 1.9.x
Download this release
Release Info
Developer | Raymond Lai |
Extension | pitneybowes_gsp |
Version | 1.2.1 |
Comparing to | |
See all releases |
Code changes from version 1.2.0 to 1.2.1
- ReadMe.txt +12 -0
- app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php +4 -3
- app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php +4 -3
- app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php +4 -3
- app/code/local/Pb/Pbgsp/Block/Form.php +4 -3
- app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php +4 -3
- app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Api.php +17 -4
- app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Catalog/Category.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Catalog/File.php +7 -4
- app/code/local/Pb/Pbgsp/Model/Catalog/Product.php +5 -4
- app/code/local/Pb/Pbgsp/Model/Credentials.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Environmentconfig.php +27 -0
- app/code/local/Pb/Pbgsp/Model/Handlingoptions.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Helper.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Inboundparcel.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Messages.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Observer.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Ordernumber.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Quote/Duty.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Util.php +4 -3
- app/code/local/Pb/Pbgsp/Model/Variable.php +4 -3
- app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php +4 -3
- app/code/local/Pb/Pbgsp/etc/config.xml +14 -10
- app/code/local/Pb/Pbgsp/etc/system.xml +46 -0
- app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php +4 -3
- app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php +4 -3
- app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php +4 -3
- app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.2-1.1.3.php +53 -0
- app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.2.0-1.2.1.php +54 -0
- package.xml +11 -7
ReadMe.txt
CHANGED
@@ -32,6 +32,18 @@ In order to take advantage of the file encryption setting in the extension confi
|
|
32 |
CHANGELOG
|
33 |
========================================================
|
34 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
35 |
v. 1.2.0
|
36 |
|
37 |
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.
|
32 |
CHANGELOG
|
33 |
========================================================
|
34 |
|
35 |
+
v. 1.2.1
|
36 |
+
|
37 |
+
Added logic in extension preferences to change API URL values dynamically from Sandbox to Production
|
38 |
+
Small adjustment to catalog product URL to use $product->getUrlInStore() .
|
39 |
+
|
40 |
+
Add required logic to ensure that the ASN generation logic is triggered no matter the method of shipment creation (manual or programmatically).
|
41 |
+
|
42 |
+
Fixed an error when the tracking number was not provided for the order.
|
43 |
+
|
44 |
+
Added backwards compatibility to CE 1.7.x+ and Enterprise 1.8.x
|
45 |
+
|
46 |
+
|
47 |
v. 1.2.0
|
48 |
|
49 |
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.
|
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Invoice/Totals.php
CHANGED
@@ -1,9 +1,10 @@
|
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
-
* Product: Pb_Pbgsp (1.2.
|
5 |
-
* Packaged: 2015-10-
|
6 |
-
* Last Modified: 2015-
|
|
|
7 |
|
8 |
|
9 |
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
+
* Product: Pb_Pbgsp (1.2.1)
|
5 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
6 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
7 |
+
|
8 |
|
9 |
|
10 |
|
app/code/local/Pb/Pbgsp/Block/Adminhtml/Sales/Order/Totals.php
CHANGED
@@ -1,9 +1,10 @@
|
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
-
* Product: Pb_Pbgsp (1.2.
|
5 |
-
* Packaged: 2015-10-
|
6 |
-
* Last Modified: 2015-
|
|
|
7 |
|
8 |
|
9 |
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
+
* Product: Pb_Pbgsp (1.2.1)
|
5 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
6 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
7 |
+
|
8 |
|
9 |
|
10 |
|
app/code/local/Pb/Pbgsp/Block/Checkout/Shipping/Method/Available.php
CHANGED
@@ -1,9 +1,10 @@
|
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
-
* Product: Pb_Pbgsp (1.2.
|
5 |
-
* Packaged: 2015-10-
|
6 |
-
* Last Modified: 2015-
|
|
|
7 |
|
8 |
|
9 |
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
+
* Product: Pb_Pbgsp (1.2.1)
|
5 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
6 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
7 |
+
|
8 |
|
9 |
|
10 |
|
app/code/local/Pb/Pbgsp/Block/Form.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Block/Sales/Order/Invoice/Totals.php
CHANGED
@@ -1,9 +1,10 @@
|
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
-
* Product: Pb_Pbgsp (1.2.
|
5 |
-
* Packaged: 2015-10-
|
6 |
-
* Last Modified: 2015-
|
|
|
7 |
|
8 |
|
9 |
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
+
* Product: Pb_Pbgsp (1.2.1)
|
5 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
6 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
7 |
+
|
8 |
|
9 |
|
10 |
|
app/code/local/Pb/Pbgsp/Block/Sales/Order/Totals.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Api.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
@@ -290,9 +291,21 @@ class Pb_Pbgsp_Model_Api
|
|
290 |
$number=$tracks[0]->getNumber();
|
291 |
$title = $tracks[0]->getTitle();
|
292 |
}else{
|
293 |
-
$number =
|
294 |
$title = 'PB';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
295 |
}
|
|
|
|
|
|
|
296 |
$requestBody = array(
|
297 |
'merchantOrderNumber' => $cpOrderNumber,
|
298 |
'parcelIdentificationNumber' => $number,
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
291 |
$number=$tracks[0]->getNumber();
|
292 |
$title = $tracks[0]->getTitle();
|
293 |
}else{
|
294 |
+
$number = $cpOrderNumber;
|
295 |
$title = 'PB';
|
296 |
+
|
297 |
+
// add the tracking info magento
|
298 |
+
$track = Mage::getModel('sales/order_shipment_track')
|
299 |
+
->setShipment($shipment)
|
300 |
+
->setData('title', 'PB')
|
301 |
+
->setData('number',$cpOrderNumber)
|
302 |
+
->setData('carrier_code', 'custom')
|
303 |
+
->setData('order_id', $shipment->getData('order_id'))
|
304 |
+
->save();
|
305 |
}
|
306 |
+
|
307 |
+
|
308 |
+
|
309 |
$requestBody = array(
|
310 |
'merchantOrderNumber' => $cpOrderNumber,
|
311 |
'parcelIdentificationNumber' => $number,
|
app/code/local/Pb/Pbgsp/Model/Carrier/ShippingMethod.php
CHANGED
@@ -1,9 +1,10 @@
|
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
-
* Product: Pb_Pbgsp (1.2.
|
5 |
-
* Packaged: 2015-10-
|
6 |
-
* Last Modified: 2015-
|
|
|
7 |
|
8 |
|
9 |
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
+
* Product: Pb_Pbgsp (1.2.1)
|
5 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
6 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
7 |
+
|
8 |
|
9 |
|
10 |
|
app/code/local/Pb/Pbgsp/Model/Catalog/Category.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Catalog/Cron.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Catalog/File.php
CHANGED
@@ -1,9 +1,10 @@
|
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
-
* Product: Pb_Pbgsp (1.2.
|
5 |
-
* Packaged: 2015-10-
|
6 |
-
* Last Modified: 2015-
|
|
|
7 |
|
8 |
|
9 |
* File: app/code/local/Pb/Pbgsp/Model/Catalog/File.php
|
@@ -179,7 +180,8 @@ class Pb_Pbgsp_Model_Catalog_File {
|
|
179 |
}
|
180 |
}
|
181 |
|
182 |
-
|
|
|
183 |
$this->_stripPartFromFileName($part);
|
184 |
//fwrite($this->file,"</CategoryList>\n<CommodityList>\n");
|
185 |
if(count($this->uploadedCategories) == 0) {
|
@@ -212,6 +214,7 @@ class Pb_Pbgsp_Model_Catalog_File {
|
|
212 |
->addAttributeToSelect('description')
|
213 |
->addAttributeToSelect('product_url')
|
214 |
->addAttributeToSelect('type_id')
|
|
|
215 |
->addAttributeToSelect('pb_pbgsp_upload')
|
216 |
->addAttributeToSelect('updated_at')
|
217 |
// ->addUrlRewrite($category->getId()) //this will add the url rewrite.
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
+
* Product: Pb_Pbgsp (1.2.1)
|
5 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
6 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
7 |
+
|
8 |
|
9 |
|
10 |
* File: app/code/local/Pb/Pbgsp/Model/Catalog/File.php
|
180 |
}
|
181 |
}
|
182 |
|
183 |
+
if($this->file)
|
184 |
+
fclose($this->file);
|
185 |
$this->_stripPartFromFileName($part);
|
186 |
//fwrite($this->file,"</CategoryList>\n<CommodityList>\n");
|
187 |
if(count($this->uploadedCategories) == 0) {
|
214 |
->addAttributeToSelect('description')
|
215 |
->addAttributeToSelect('product_url')
|
216 |
->addAttributeToSelect('type_id')
|
217 |
+
->addAttributeToSelect('url_in_store')
|
218 |
->addAttributeToSelect('pb_pbgsp_upload')
|
219 |
->addAttributeToSelect('updated_at')
|
220 |
// ->addUrlRewrite($category->getId()) //this will add the url rewrite.
|
app/code/local/Pb/Pbgsp/Model/Catalog/Product.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
@@ -27,7 +28,7 @@ class Pb_Pbgsp_Model_Catalog_Product {
|
|
27 |
}
|
28 |
else
|
29 |
$this -> product = Mage::getModel('catalog/product') -> load($id);
|
30 |
-
$this->_productUrl = $url;
|
31 |
}
|
32 |
|
33 |
/**
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
28 |
}
|
29 |
else
|
30 |
$this -> product = Mage::getModel('catalog/product') -> load($id);
|
31 |
+
$this->_productUrl = $this -> product->getUrlInStore();// $url;
|
32 |
}
|
33 |
|
34 |
/**
|
app/code/local/Pb/Pbgsp/Model/Credentials.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Creditmemo/Duty.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Environmentconfig.php
ADDED
@@ -0,0 +1,27 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Product: Pb_Pbgsp (1.1.2)
|
4 |
+
* Packaged: 2015-09-14T12:11:20+00:00
|
5 |
+
* Last Modified: 2015-09-9T12:10: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 |
+
|
15 |
+
public function toOptionArray()
|
16 |
+
{
|
17 |
+
return array(
|
18 |
+
array('value'=>"0", 'label'=>'Select'),
|
19 |
+
array('value'=>"1", 'label'=>'Sandbox'),
|
20 |
+
array('value'=>"2", 'label'=>'Production'),
|
21 |
+
|
22 |
+
|
23 |
+
);
|
24 |
+
}
|
25 |
+
|
26 |
+
|
27 |
+
}
|
app/code/local/Pb/Pbgsp/Model/Handlingoptions.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Helper.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Inboundparcel.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Invoice/Duty.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Messages.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Mysql4/Inboundparcel/Collection.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Mysql4/Ordernumber/Collection.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Mysql4/Variable/Collection.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Observer.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
* File: app/code/local/Pb/Pbgsp/Model/Observer.php
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
* File: app/code/local/Pb/Pbgsp/Model/Observer.php
|
app/code/local/Pb/Pbgsp/Model/Ordernumber.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Pdf/Tax.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Quote/Duty.php
CHANGED
@@ -1,9 +1,10 @@
|
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
-
* Product: Pb_Pbgsp (1.2.
|
5 |
-
* Packaged: 2015-10-
|
6 |
-
* Last Modified: 2015-
|
|
|
7 |
|
8 |
|
9 |
|
1 |
<?php
|
2 |
|
3 |
/**
|
4 |
+
* Product: Pb_Pbgsp (1.2.1)
|
5 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
6 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
7 |
+
|
8 |
|
9 |
|
10 |
|
app/code/local/Pb/Pbgsp/Model/Resource/Mysql4/Setup.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Sales/Order/Shipment.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Util.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/Model/Variable.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/data/pb_pbgsp_setup/data-install-1.0.0.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
* File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
* File: app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
|
app/code/local/Pb/Pbgsp/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Pb_Pbgsp>
|
5 |
-
<version>1.2.
|
6 |
</Pb_Pbgsp>
|
7 |
</modules>
|
8 |
<global>
|
@@ -15,6 +15,7 @@
|
|
15 |
<!--</sales_email_pb_shipment_template>-->
|
16 |
<!--</email>-->
|
17 |
<!--</template>-->
|
|
|
18 |
<blocks>
|
19 |
<PB_Pbgsp>
|
20 |
<class>Pb_Pbgsp_Block</class>
|
@@ -97,6 +98,17 @@
|
|
97 |
<!--</Pb_Pbgsp_Model_CheckoutSubmitAllAfter>-->
|
98 |
<!--</observers>-->
|
99 |
<!--</checkout_submit_all_after>-->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
100 |
<core_block_abstract_to_html_after>
|
101 |
<observers>
|
102 |
<Pb_Pbgsp_Model_OrderView>
|
@@ -500,15 +512,7 @@
|
|
500 |
<!--</Pb_Pbgsp_CreateParcel>-->
|
501 |
<!--</observers>-->
|
502 |
<!--</sales_order_save_commit_after>-->
|
503 |
-
|
504 |
-
<observers>
|
505 |
-
<Pb_Pbgsp_CreateParcel>
|
506 |
-
<type>model</type>
|
507 |
-
<class>pb_pbgsp/observer</class>
|
508 |
-
<method>generateInboundParcelPreAdvice</method>
|
509 |
-
</Pb_Pbgsp_CreateParcel>
|
510 |
-
</observers>
|
511 |
-
</sales_order_shipment_save_after>
|
512 |
<order_cancel_after>
|
513 |
<observers>
|
514 |
<Pb_Pbgsp_CreateParcel>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<Pb_Pbgsp>
|
5 |
+
<version>1.2.1</version>
|
6 |
</Pb_Pbgsp>
|
7 |
</modules>
|
8 |
<global>
|
15 |
<!--</sales_email_pb_shipment_template>-->
|
16 |
<!--</email>-->
|
17 |
<!--</template>-->
|
18 |
+
|
19 |
<blocks>
|
20 |
<PB_Pbgsp>
|
21 |
<class>Pb_Pbgsp_Block</class>
|
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>
|
512 |
<!--</Pb_Pbgsp_CreateParcel>-->
|
513 |
<!--</observers>-->
|
514 |
<!--</sales_order_save_commit_after>-->
|
515 |
+
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
516 |
<order_cancel_after>
|
517 |
<observers>
|
518 |
<Pb_Pbgsp_CreateParcel>
|
app/code/local/Pb/Pbgsp/etc/system.xml
CHANGED
@@ -20,6 +20,52 @@
|
|
20 |
<show_in_website>1</show_in_website>
|
21 |
<show_in_store>1</show_in_store>
|
22 |
</active>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
23 |
<merchantcode translate="label">
|
24 |
<label>Merchant Code</label>
|
25 |
<frontend_type>text</frontend_type>
|
20 |
<show_in_website>1</show_in_website>
|
21 |
<show_in_store>1</show_in_store>
|
22 |
</active>
|
23 |
+
<environment translate="label">
|
24 |
+
<label>Environment</label>
|
25 |
+
<frontend_type>select</frontend_type>
|
26 |
+
<source_model>pb_pbgsp/environmentconfig</source_model>
|
27 |
+
<comment><![CDATA[
|
28 |
+
<script type='text/javascript'>
|
29 |
+
function init_comment()
|
30 |
+
{
|
31 |
+
|
32 |
+
$('carriers_pbgsp_environment').observe('change', function(){
|
33 |
+
var field_value = $('carriers_pbgsp_environment').getValue();
|
34 |
+
if(field_value == 2){
|
35 |
+
var authorization_endpoint = 'https://cbs.ecommerce.pb.com/auth/token';
|
36 |
+
var checkout_endpoint = 'https://cbs.ecommerce.pb.com/checkout/services/v1';
|
37 |
+
var order_mgmt_api = 'https://cbs.ecommerce.pb.com/order-mgmt/services/v1';
|
38 |
+
var ftphost = 'sftp-cbs.ecommerce.pb.com';
|
39 |
+
|
40 |
+
} else if(field_value == 1){
|
41 |
+
var authorization_endpoint = 'https://sandbox-cbs.ecommerce.pb.com/auth/token';
|
42 |
+
var checkout_endpoint = 'https://sandbox-cbs.ecommerce.pb.com/checkout/services/v1';
|
43 |
+
var order_mgmt_api = 'https://op-sandbox-cbs.ecommerce.pb.com/order-mgmt/services/v1';
|
44 |
+
var ftphost = 'sftp-sandbox-cbs.ecommerce.pb.com';
|
45 |
+
|
46 |
+
} else{
|
47 |
+
|
48 |
+
var authorization_endpoint = '';
|
49 |
+
var checkout_endpoint = '';
|
50 |
+
var order_mgmt_api = '';
|
51 |
+
var ftphost = '';
|
52 |
+
}
|
53 |
+
|
54 |
+
$('carriers_pbgsp_authorization_endpoint').setValue(authorization_endpoint); $('carriers_pbgsp_checkout_endpoint').setValue(checkout_endpoint);
|
55 |
+
$('carriers_pbgsp_order_mgmt_api').setValue(order_mgmt_api);
|
56 |
+
$('carriers_pbgsp_ftphost').setValue(ftphost);
|
57 |
+
});
|
58 |
+
}
|
59 |
+
document.observe('dom:loaded', function(){init_comment();});
|
60 |
+
</script>
|
61 |
+
]]>
|
62 |
+
</comment>
|
63 |
+
<sort_order>5</sort_order>
|
64 |
+
<show_in_default>1</show_in_default>
|
65 |
+
<show_in_website>1</show_in_website>
|
66 |
+
<show_in_store>1</show_in_store>
|
67 |
+
</environment>
|
68 |
+
|
69 |
<merchantcode translate="label">
|
70 |
<label>Merchant Code</label>
|
71 |
<frontend_type>text</frontend_type>
|
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-install-1.0.0.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.0.0-1.0.1.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.1-1.1.2.php
CHANGED
@@ -1,8 +1,9 @@
|
|
1 |
<?php
|
2 |
/**
|
3 |
-
* Product: Pb_Pbgsp (1.2.
|
4 |
-
* Packaged: 2015-10-
|
5 |
-
* Last Modified: 2015-
|
|
|
6 |
|
7 |
|
8 |
|
1 |
<?php
|
2 |
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+00:00
|
6 |
+
|
7 |
|
8 |
|
9 |
|
app/code/local/Pb/Pbgsp/sql/pbgsp_setup/mysql4-upgrade-1.1.2-1.1.3.php
ADDED
@@ -0,0 +1,53 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
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
ADDED
@@ -0,0 +1,54 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
/**
|
3 |
+
* Product: Pb_Pbgsp (1.2.1)
|
4 |
+
* Packaged: 2015-10-07T12:08:45+00:00
|
5 |
+
* Last Modified: 2015-10-01T12:11:15+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 |
+
$versionInfo = Mage::getVersionInfo();
|
20 |
+
$version = floatval($versionInfo['major'].'.'.$versionInfo['minor']);
|
21 |
+
if(Mage::getEdition() == Mage::EDITION_COMMUNITY && $version <= 1.7) {
|
22 |
+
$eav = Mage::getResourceModel('catalog/setup', 'catalog_setup');//new Mage_Eav_Model_Entity_Setup('catalog_setup');
|
23 |
+
$eav->removeAttribute('catalog_product','pb_pbgsp_upload');
|
24 |
+
$eav->addAttribute('catalog_product', 'pb_pbgsp_upload', array(
|
25 |
+
'type' => 'int',
|
26 |
+
'input' => 'text',
|
27 |
+
'label' => 'Last PBGSP upload timestampt',
|
28 |
+
'global' => 2,
|
29 |
+
'user_defined' => 0,
|
30 |
+
'required' => 0,
|
31 |
+
'visible' => 1,
|
32 |
+
'default' => 0
|
33 |
+
|
34 |
+
));
|
35 |
+
$eav->removeAttribute('catalog_category','pb_pbgsp_upload');
|
36 |
+
$eav->addAttribute('catalog_category', 'pb_pbgsp_upload', array(
|
37 |
+
'type' => 'int',
|
38 |
+
'input' => 'text',
|
39 |
+
'label' => 'Last PBGSP upload timestampt',
|
40 |
+
'global' => 2,
|
41 |
+
'user_defined' => 0,
|
42 |
+
'required' => 0,
|
43 |
+
'visible' => 1,
|
44 |
+
'default' => 0,
|
45 |
+
'group' => 'PBGSP'
|
46 |
+
|
47 |
+
));
|
48 |
+
|
49 |
+
|
50 |
+
}
|
51 |
+
|
52 |
+
|
53 |
+
$installer->endSetup();
|
54 |
+
?>
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>pitneybowes_gsp</name>
|
4 |
-
<version>1.2.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">Open Software License (OSL)</license>
|
7 |
<channel>community</channel>
|
@@ -24,16 +24,20 @@ To learn more, go to <a href="http://www.pb.com/ecom">http://www.pb.com/ec
|
|
24 |
</description>
|
25 |
<notes>Patch release for Magento Connect.
|
26 |

|
27 |
-
1.
|
28 |

|
29 |
-
2.
|
30 |

|
31 |
-
3.
|
|
|
|
|
|
|
|
|
32 |
</notes>
|
33 |
<authors><author><name>Raymond Lai</name><user>r3lai</user><email>raymond.lai@pb.com</email></author></authors>
|
34 |
-
<date>2015-10-
|
35 |
-
<time>
|
36 |
-
<contents><target name="magelocal"><dir name="Pb"><dir name="Pbgsp"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="
|
37 |
<compatible/>
|
38 |
<dependencies><required><php><min>5.1.0</min><max>5.6.0</max></php></required></dependencies>
|
39 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>pitneybowes_gsp</name>
|
4 |
+
<version>1.2.1</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>
|
24 |
</description>
|
25 |
<notes>Patch release for Magento Connect.
|
26 |

|
27 |
+
1. Added logic in extension preferences to change API URL values dynamically from Sandbox to Production
|
28 |

|
29 |
+
2. Small adjustment to catalog product URL to use $product->getUrlInStore() .
|
30 |

|
31 |
+
3. Add required logic to ensure that the ASN generation logic is triggered no matter the method of shipment creation (manual or programmatically).
|
32 |
+

|
33 |
+
4. Fixed an error when the tracking number was not provided for the order.
|
34 |
+

|
35 |
+
5. Added backwards compatibility to CE 1.7.x+ and Enterprise 1.9.x
|
36 |
</notes>
|
37 |
<authors><author><name>Raymond Lai</name><user>r3lai</user><email>raymond.lai@pb.com</email></author></authors>
|
38 |
+
<date>2015-10-07</date>
|
39 |
+
<time>13:13:47</time>
|
40 |
+
<contents><target name="magelocal"><dir name="Pb"><dir name="Pbgsp"><dir name="Block"><dir name="Adminhtml"><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="47a66163b654777e330310887b9c71a2"/></dir><file name="Totals.php" hash="ca34fdbdcc87aafece8a8fa56d9b4894"/></dir></dir></dir><dir name="Checkout"><dir name="Shipping"><dir name="Method"><file name="Available.php" hash="0578836807ce728af082300708a5616d"/></dir></dir></dir><file name="Form.php" hash="e9b7566214d2ac8aeca13953961933b0"/><dir name="Sales"><dir name="Order"><dir name="Invoice"><file name="Totals.php" hash="a6f52ffe2b77941af68176f7992e95ca"/></dir><file name="Totals.php" hash="d44af5a3bc4a0a548c27e8a2f7baf4c5"/></dir></dir></dir><dir name="Model"><file name="Api.php" hash="ed61a102a26f4fc079fc9b26c3c0e563"/><file name="Authapioptions.php" hash="8cd4e0e89c1bc6b5ca12d502386c89a2"/><dir name="Carrier"><file name="ShippingMethod.php" hash="c4114b7021ec133743203ee78698a56d"/></dir><dir name="Catalog"><file name="Category.php" hash="e106c28314a00c732989003d84b6e87e"/><file name="Cron.php" hash="4500d19ababff183840f80009550b146"/><file name="File.php" hash="37e16cdd8fc59e0e183730e41345521d"/><file name="Product.php" hash="f9b66ad81c2fdd9edf4f5b078bf3930b"/></dir><file name="Credentials.php" hash="30856e7f080bacb5ff33d2fad12dcc22"/><dir name="Creditmemo"><file name="Duty.php" hash="92b6b45bb85194032ed445cd9bd028b1"/></dir><file name="Environmentconfig.php" hash="3c5c55da46cbc505a79a62aa30bcabf3"/><file name="Handlingoptions.php" hash="2c668ee304fd2c94292e9dee5e9e5990"/><file name="Helper.php" hash="5a16976d01b6a01efc9b08c4e3db5060"/><file name="Inboundparcel.php" hash="4761865c2b4da067535c98ed0e8092a8"/><dir name="Invoice"><file name="Duty.php" hash="f3ad12a0f79a0cff10082830b928ba95"/></dir><file name="Messages.php" hash="f89a614d0b582fecadb0a09035598909"/><dir name="Mysql4"><dir name="Inboundparcel"><file name="Collection.php" hash="88f83cc96d7629befc694cfdef7db206"/></dir><file name="Inboundparcel.php" hash="f580ab1f340c4e79cb4cec26abe266dc"/><dir name="Ordernumber"><file name="Collection.php" hash="613dab5f4a207cec49577bb4bf7551ac"/></dir><file name="Ordernumber.php" hash="c82f42cdbef067b5c1b4b0c726528863"/><dir name="Variable"><file name="Collection.php" hash="0cce896d4e2b2a3489dfade52612559d"/></dir><file name="Variable.php" hash="1b0bb067d7f7b4536486bb2aaf849c8c"/></dir><file name="Observer.php" hash="284a3f5aee7ef5c87269442aca678b6c"/><file name="Ordernumber.php" hash="86c498c90627dab7e3098242945337a2"/><dir name="Pdf"><file name="Tax.php" hash="5567eed41317876b404ed8fef8924e11"/></dir><dir name="Quote"><file name="Duty.php" hash="1d0ac176beb14c700d8a4e4618cdb18f"/></dir><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="52f0c5f12302cee157d5a8a4e2094b39"/></dir></dir><dir name="Sales"><dir name="Order"><file name="Shipment.php" hash="1c06f7701a0100d41700165cb3449f3a"/></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="c38d529f39adc06f9314f675d5220481"/><file name="Variable.php" hash="5a5319c7b77022f88e102987d4a32351"/></dir><dir name="data"><dir name="pb_pbgsp_setup"><file name="data-install-1.0.0.php" hash="ab174aa157896675526a3cb9146f8d01"/></dir></dir><dir name="etc"><file name="config.xml" hash="8bc02ba93ef28ccc270dbb82d942f372"/><file name="system.xml" hash="2be42cc9ffc0c6e191c6ad09c6fe28a0"/><file name="system.xml_bk" hash="66ab74c09711ce8ff5a75ba80688c194"/></dir><dir name="sql"><dir name="pbgsp_setup"><file name="mysql4-install-1.0.0.php" hash="f9c8ff52ef8cc2dd11bced59dee05a17"/><file name="mysql4-upgrade-1.0.0-1.0.1.php" hash="c25b5c55bfb9b7256dad8e402aaa2e8f"/><file name="mysql4-upgrade-1.1.1-1.1.2.php" hash="d35fc88aa22fa0272f4e44f65c684a14"/><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="c0ec21ffb4d3a22339bb2875e4c9d5ad"/></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="108e5bf0476aa0145f258f8cea50d94b"/></dir></target></contents>
|
41 |
<compatible/>
|
42 |
<dependencies><required><php><min>5.1.0</min><max>5.6.0</max></php></required></dependencies>
|
43 |
</package>
|