soluship_shipping_magento

Version Notes

order create and print label issues fixed

Release Info

Developer	selva ganesh
Extension	soluship_shipping_magento
Version	1.1.2
Comparing to
See all releases

Code changes from version 1.1.0 to 1.1.2

Files changed (6) hide show

app/code/community/Soluship/Shipping1/Model/Observer.php +1 -1
app/code/community/Soluship/Shipping1/Model/Observer1.php +25 -1
app/code/community/Soluship/Shipping1/Model/Sales/Order/View.php +3 -3
app/code/community/Soluship/Shipping1/controllers/Adminhtml/IndexController.php +247 -0
app/code/community/Soluship/Shipping1/etc/config.xml +2 -2
package.xml +19 -16

app/code/community/Soluship/Shipping1/Model/Observer.php CHANGED Viewed

	@@ -73,7 +73,7 @@ $ShippingMethod=array(
73	$obj->grandTotal=$order->getGrandTotal();
74	$obj->shipping_method=$ShippingMethod;
75
76	-
77	$obj->ShippingAddress=$ShippingAddress;
78	$obj->id=$_orderId;
79	$obj->shippingPackage=$this->createOrderItems($order);


73	$obj->grandTotal=$order->getGrandTotal();
74	$obj->shipping_method=$ShippingMethod;
75
76	+ $obj->recreate =false;
77	$obj->ShippingAddress=$ShippingAddress;
78	$obj->id=$_orderId;
79	$obj->shippingPackage=$this->createOrderItems($order);

app/code/community/Soluship/Shipping1/Model/Observer1.php CHANGED Viewed

@@ -77,6 +77,22 @@ $block->addButton('do_something_crazy', array(
                             'onclick'   => 'popWin(\'' . $tracking_url . '\')',
                             'class'     => 'go'
                         ));
@@ -96,8 +112,16 @@ $block->addButton('do_something_crazy1', array(
                             'onclick'   => 'popWin(\'' . $url1 . '\')',
                             'class'     => 'go'
                         ));
-            -
+                    }
+                }


77	'onclick' => 'popWin(\'' . $tracking_url . '\')',
78	'class' => 'go'
79	));
80	+ $url11=$carriers['soluship_shipping1']['shippingserver']."/ecomPrintLabel.action?SolushipAccessKey=".$carriers['soluship_shipping1']['solushipaccesstoekn']."&ids=".$order->entity_id."&ecomplatform=magento";
81	+
82	+ $block->addButton('do_something_craz1y', array(
83	+ 'label' => 'Soluship Print Label',
84	+ 'onclick' => 'popWin(\'' . $url11 . '\')',
85	+ 'class' => 'go'
86	+ ));
87	+
88	+
89	+
90	+ /*
91	+ $block->addButton('solushippl', array(
92	+ 'label' => Mage::helper('Sales')->__('Soluship Print Label'),
93	+ 'onclick' => 'setLocation(\'' . $url . '\')',
94	+ 'class' => 'go'
95	+ ), 0, 100, 'header', 'header');*/
96
97
98

112	'onclick' => 'popWin(\'' . $url1 . '\')',
113	'class' => 'go'
114	));
115	+
116	+ if($order->getStatusLabel()!="Canceled"){
117	+
118	+
119	+ $message="Do want to Create Shipping Order in Soluship ?.";
120	+ $block->addButton('in_shipment',
121	+ array( 'label' => Mage::helper('sales')->__('Create Shipping Order'),
122	+ 'onclick' => "popWin(confirmSetLocation('{$message}', '{$block->getUrl('shipping1/adminhtml_index/shipment')}'))", 'class' => 'go' ));
123
124	+ }
125	}
126	}
127

app/code/community/Soluship/Shipping1/Model/Sales/Order/View.php CHANGED Viewed

	@@ -15,13 +15,13 @@ class Soluship_Shipping1_Model_Sales_Order_View extends Mage_Adminhtml_Block_Sa
15	if($this->getOrder()->getStatusLabel()!="Canceled"){
16
17
18	-
19	- $this->_addButton('~~testbutton~~', array(
20	'label' => Mage::helper('Sales')->__('Soluship Print Label'),
21	'onclick' => 'setLocation(\'' . $url . '\')',
22	'class' => 'go'
23	), 0, 100, 'header', 'header');
24	-
25
26
27


15	if($this->getOrder()->getStatusLabel()!="Canceled"){
16
17
18	+ /*
19	+ $this->_addButton('testbutton11', array(
20	'label' => Mage::helper('Sales')->__('Soluship Print Label'),
21	'onclick' => 'setLocation(\'' . $url . '\')',
22	'class' => 'go'
23	), 0, 100, 'header', 'header');
24	+ */
25
26
27

app/code/community/Soluship/Shipping1/controllers/Adminhtml/IndexController.php ADDED Viewed

	@@ -0,0 +1,247 @@


1	+ <?php
2	+
3	+ class Soluship_Shipping1_Adminhtml_IndexController extends Mage_Adminhtml_Controller_Action
4	+ {
5	+ protected function _initOrder()
6	+ {
7	+ $id = $this->getRequest()->getParam('order_id');
8	+ $order = Mage::getModel('sales/order')->load($id);
9	+
10	+ if (!$order->getId()) {
11	+ $this->_getSession()->addError($this->__('This order no longer exists.'));
12	+ $this->_redirect('//');
13	+ $this->setFlag('', self::FLAG_NO_DISPATCH, true);
14	+ return false;
15	+ }
16	+ Mage::register('sales_order', $order);
17	+ Mage::register('current_order', $order);
18	+ return $order;
19	+ }
20	+
21	+
22	+ /*public function rtoAction()
23	+ {
24	+ if ($order = $this->_initOrder()) {
25	+ try {
26	+ $order->setState('rto', true)->save();
27	+ $this->_getSession()->addSuccess($this->__('The order state has been changed.'));
28	+ }
29	+ catch (Mage_Core_Exception $e) {
30	+ $this->_getSession()->addError($e->getMessage());
31	+ }
32	+ catch (Exception $e) {
33	+ $this->_getSession()->addError($this->__('The order state has not been changed.'));
34	+ Mage::logException($e);
35	+ }
36	+ $this->_redirect('adminhtml/sales_order/view', array(
37	+ 'order_id' => $order->getId()
38	+ ));
39	+ }
40	+
41	+ }*/
42	+
43	+ public function shipmentAction()
44	+ {
45	+
46	+ $carriers = Mage::getStoreConfig('carriers');
47	+
48	+
49	+ if ($order = $this->_initOrder()) {
50	+ try {
51	+ //$order->setState('shipment', true)->save();
52	+ $url1=$carriers['soluship_shipping1']['shippingserver']."/ecomOrderRepeat.action?SolushipAccessKey=".$carriers['soluship_shipping1']['solushipaccesstoekn']."&ids=".$order->entity_id.",&ecomplatform=magento&recreate=true";
53	+
54	+
55	+ $converter = Mage::getModel('sales/convert_order');
56	+ $shipment = $converter->toShipment($order);
57	+
58	+
59	+ $customer = Mage::getModel('customer/customer')->load($order->getData('customer_id'));
60	+
61	+ $obj = new Soluship_Shipping1_Adminhtml_IndexController();
62	+
63	+ $billingaddress1 = $order->getBillingAddress();
64	+
65	+ $billingaddress = array(
66	+ 'customerName' => $order->getData('firstname'),
67	+ 'lastName' => $order->getData('lastname'),
68	+ 'companyName' => $billingaddress1->getData('company'),
69	+ 'telephone' => $billingaddress1->getData('telephone'),
70	+ 'email' => $billingaddress1->getData('email'),
71	+ 'street' => $billingaddress1->getData('street'),
72	+ 'city' => $billingaddress1->getData('city'),
73	+ 'region' => $billingaddress1->getData('region'),
74	+ 'postcode' => $billingaddress1->getData('postcode'),
75	+ 'country' => $billingaddress1->getData('country')
76	+ );
77	+
78	+ $shipaddress = $shipment->getShippingAddress();
79	+
80	+
81	+
82	+ $ShippingAddress = array(
83	+ 'companyName' => $shipaddress->getData('company'),
84	+ 'customerName' => $shipaddress->getData('firstname'),
85	+ 'lastName' => $shipaddress->getData('lastname'),
86	+ 'telephone' => $shipaddress->getData('telephone'),
87	+ 'email' => $shipaddress->getData('email'),
88	+ 'street' => $shipaddress->getData('street'),
89	+ 'city' => $shipaddress->getData('city'),
90	+ 'region' => $shipaddress->getData('region'),
91	+ 'postcode' => $shipaddress->getData('postcode'),
92	+ 'country' => $shipaddress->getCountry()
93	+ );
94	+
95	+ $shipmethod = $order->getShippingMethod();
96	+
97	+
98	+ $ShippingMethod = array(
99	+ 'shipping' => $order->getData('shipping_method')
100	+
101	+ );
102	+
103	+
104	+ $obj->recreate =true;
105	+ $obj->biladd = $billingaddress;
106	+ $obj->grandTotal = $order->getGrandTotal();
107	+ $obj->shipping_method = $ShippingMethod;
108	+
109	+
110	+ $obj->ShippingAddress = $ShippingAddress;
111	+ $obj->id = $order->getId();
112	+ $obj->shippingPackage = $this->createOrderItems($order);
113	+
114	+
115	+ $obj->ship_setting = Mage::getStoreConfig('shipping');
116	+
117	+ $carriers = Mage::getStoreConfig('carriers');
118	+ $obj->soluship_setting = $carriers;
119	+
120	+ $store_info = Mage::getStoreConfig('general');
121	+ $obj->magento_store = $store_info;
122	+
123	+ $obj->currency = Mage::getStoreConfig('currency');
124	+ $obj->store_email = Mage::getStoreConfig('trans_email');
125	+
126	+
127	+
128	+
129	+ $client = new Varien_Http_Client($carriers['soluship_shipping1']['shippingserver'] . '/api/v1/createShipment');
130	+ $client->setMethod(Varien_Http_Client::POST);
131	+ $client->setHeaders('x-magento-shop-domain: MAGENTO');
132	+ /*$client->setHeaders('username: '.$carriers['soluship_shipping1']['apiusername']);
133	+ $client->setHeaders('password: '.$carriers['soluship_shipping1']['apipassword']);*/
134	+ $client->setHeaders('SolushipAccessKey: ' . $carriers['soluship_shipping1']['solushipaccesstoekn']);
135	+ $client->setHeaders('SolushipHost: ' . $_SERVER['SERVER_NAME']);
136	+
137	+ $json = json_encode($obj);
138	+
139	+ $client->setRawData($json, 'application/json');
140	+ $response = $client->request();
141	+
142	+
143	+
144	+
145	+
146	+ $this->_getSession()->addSuccess($this->__('The order will created in soluship.'));
147	+ }
148	+
149	+ catch (Exception $e) {
150	+ $this->_getSession()->addError($this->__('The order is not created in soluship.'));
151	+ Mage::logException($e);
152	+ }
153	+
154	+
155	+
156	+ $this->_redirectUrl($url1);
157	+
158	+
159	+ }
160	+
161	+
162	+
163	+
164	+
165	+
166	+
167	+ }
168	+
169	+
170	+
171	+
172	+ public function createOrderItems($order)
173	+ {
174	+
175	+ $carriers = Mage::getStoreConfig('carriers');
176	+ $lenghtc = $carriers['soluship_shipping1']['length_attribute'];
177	+ $heightc = $carriers['soluship_shipping1']['height_attribute'];
178	+ $widthc = $carriers['soluship_shipping1']['width_attribute'];
179	+
180	+ $items = $order->getAllVisibleItems();
181	+ $i = 0;
182	+ $IO = array();
183	+ $itemcount = count($items);
184	+ $ww = 0.0;
185	+
186	+ $storeId = Mage::app()->getStore()->getStoreId();
187	+
188	+
189	+
190	+ foreach ($items as $item) {
191	+ $IO[$i]['name'] = $item->getName();
192	+ $IO[$i]['price'] = $item->getPrice();
193	+ $IO[$i]['sku'] = $item->getSku();
194	+ $IO[$i]['id'] = $item->getProductId();
195	+
196	+
197	+ $cProduct = Mage::getModel('catalog/product')->load($item->getProductId());
198	+ Mage::log($cProduct[$lenghtc]);
199	+ $IO[$i]['length'] = $cProduct[$lenghtc];
200	+ $IO[$i]['height'] = $cProduct[$heightc];
201	+ $IO[$i]['width'] = $cProduct[$widthc];
202	+
203	+ //$cProduct = Mage::getModel('catalog/product');
204	+
205	+ $cProduct = Mage::getModel('catalog/product')->load($item->getProductId());
206	+ //$cProduct->load($item->getProductId());
207	+ $json1 = Mage::helper('core')->jsonEncode($cProduct);
208	+
209	+ $pweight = $cProduct->getWeight();
210	+
211	+
212	+ $IO[$i]['qty'] = $item->getQtyOrdered();
213	+ $IO[$i]['weight'] = $pweight;
214	+ $qty = $item->getQtyOrdered();
215	+ $ww = $ww + ((double) $pweight * (int) $qty);
216	+
217	+ if ($itemcount > 1) {
218	+ $IO[$i]['shipping'] = $order->getData('shipping_amount') / $itemcount;
219	+ $IO[$i]['tax'] = $order->getData('tax_amount') / $itemcount;
220	+ } elseif ($itemcount == 1) {
221	+ $IO[$i]['shipping'] = $order->getData('shipping_amount');
222	+ $IO[$i]['tax'] = $order->getData('tax_amount');
223	+ }
224	+
225	+
226	+ $i++;
227	+ }
228	+
229	+
230	+
231	+
232	+
233	+ $packs = array(
234	+ 'items' => $IO,
235	+ 'package_weight' => $ww
236	+
237	+ );
238	+
239	+
240	+
241	+
242	+ return $packs;
243	+ }
244	+
245	+
246	+
247	+ }

app/code/community/Soluship/Shipping1/etc/config.xml CHANGED Viewed

	@@ -70,7 +70,7 @@
70
71
72
73	- ~~<!--~~ <admin>
74	<routers>
75	<adminhtml>
76	<args>
	@@ -82,7 +82,7 @@
82	</adminhtml>
83	</routers>
84	</admin>
85	- ~~-->~~
86	<frontend>
87
88	<routers>


70
71
72
73	+ <admin>
74	<routers>
75	<adminhtml>
76	<args>

82	</adminhtml>
83	</routers>
84	</admin>
85	+
86	<frontend>
87
88	<routers>

package.xml CHANGED Viewed

	@@ -1,36 +1,39 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>soluship_shipping_magento</name>
4	- <version>1.1.0</version>
5	<stability>stable</stability>
6	- <license uri="http://opensource.org/licenses/osl-3.0.php"> Magento community website is: OSL v3.0</license>
7	<channel>community</channel>
8	<extends/>
9	- <summary>Soluship(SOLUtion based SHIPments) is a shipment based project in which service is made globally. Its FREE* to use.</summary>
10	<description>FEATURES
11
12	- AUTOMATE THE SHIPPING
13
14	With Easy Store configuration Bigcommerce Merchants can avail Soluship shipping will automate the shipping order handle.
15	- ~~Once people created sales order from Bigcommerce Store, Soluship will create exact shipping order and update the tracking details to your Bigcommerce Order.&#~~xD;


16	CHEAPEST SHIPPING
17
18	- If Merchants wants to choose wide variety of shipping rates from many carriers , soluship will provide the shipping rates~~.&#~~xD;
19	- ~~PRINT SHIPPING LABELS~~

20
21	Merchants can able get the Carrier shipping labels from soluship by any order or bulk.
22	CARRIERS WITH SOLUSHIP
23
24	create shipment by getting the predefined rates with respect to the shipment details provided by the customer, from various services such as UPS, DHL, PUROLATOR, FEDEX etc..,
25	- There are some additional functionalities such as pick up request ,EDI import (where multiple shipments can be created by importing an edi file), Track and Search which makes the shipments user friendly.


26	*Merchants need not pay nothing for App usages. They will pay only for shipping orders in soluship.</description>
27	- <notes>~~dimension~~ ~~based~~ ~~shipping~~ ~~enabled ~~
28	- ~~shipping~~ ~~label bug fixes ~~
29	- </~~notes~~>
30	- <~~authors><author><name~~>~~selvaganesh~~</~~name><user~~>~~selva</user><email>ecommerce@justintegrateit.com</email></author></authors>~~
31	- <~~date~~>~~2017-04-28</date>~~
32	- <time>10:51:43</time>
33	- <contents><target name="mageetc"><dir name="modules"><file name="Soluship_Shipping_Magento.xml" hash="1a18096cc7c20498f4309178bc94b75b"/></dir></target><target name="magecommunity"><dir name="Soluship"><dir name="Shipping1"><dir name="Helper"><dir name="Data"><file name="Data.php" hash="2e5fa7cb0c497b1394f42299f977e259"/></dir></dir><dir name="Model"><file name="Data.php" hash="2e5fa7cb0c497b1394f42299f977e259"/><file name="Demo.php" hash="905d9ed0db62b4207c53fbda0e9486e7"/><file name="DimensionUnit.php" hash="9bc66802605620c4b71503d045517317"/><dir name="Dropdown"><file name="MarkupFlatOption.php" hash="c3dcad22ff96aefc5c0d8fb337b76e72"/><file name="MarkupType.php" hash="cd257aa3181386707781f56440411280"/><file name="Unitofmeasure.php" hash="40941ba42763a599ae6e2fc2f8410208"/></dir><file name="FreeShipOptions.php" hash="440c1e0121575e9f3cf2321831157eb8"/><file name="ListAttributes.php" hash="ca607f97314cff75cdeb155169288e7a"/><file name="Observer.php" hash="b9bf46f6809d86c4a1330b4452b6175b"/><file name="Observer1.php" hash="59c279df024213af05750094d619207a"/><file name="Option.php" hash="8da2d8863b128b42344570b32d344622"/><file name="PackageOption.php" hash="5e20eeab541a8901af33bcd771e7fde9"/><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="e908fb2554b19058b710b52d5fca9aa7"/><file name="View.php" hash="df76dc675e766233bf373cc3389ec102"/><file name="ViewTrack.php" hash="0180b81c41ea8345ac8b5f22280f8163"/></dir></dir><file name="Weightunit.php" hash="fa47f1ad50ae4f689a8ede921d9bd140"/><file name="printlabel.php" hash="feabe5cc691b088d6ade3e04d6b120fc"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="MassactionController.php" hash="715f6a5dc0b9362faf4e0cc7935db2a5"/></dir></dir><dir name="etc"><file name="config.xml" hash="44c53dcfd1247390dbb8c078aafa0df7"/><file name="system.xml" hash="c24d9cba20645e75f31a77bd48cb8d35"/></dir></dir></dir></target></contents>
34	<compatible/>
35	- <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
36	</package>


1	<?xml version="1.0"?>
2	<package>
3	<name>soluship_shipping_magento</name>
4	+ <version>1.1.2</version>
5	<stability>stable</stability>
6	+ <license uri="http://opensource.org/licenses/osl-3.0.php">Magento community website is: OSL v3.0</license>
7	<channel>community</channel>
8	<extends/>
9	+ <summary> Soluship(SOLUtion based SHIPments) is a shipment based project in which service is made globally. Its FREE* to use.</summary>
10	<description>FEATURES
11
12	+ AUTOMATE THE SHIPPING
13
14	With Easy Store configuration Bigcommerce Merchants can avail Soluship shipping will automate the shipping order handle.
15	+
16	+ Once people created sales order from Bigcommerce Store, Soluship will create exact shipping order and update the tracking details to your Bigcommerce Order.
17	+
18	CHEAPEST SHIPPING
19
20	+ If Merchants wants to choose wide variety of shipping rates from many carriers , soluship will provide the shipping rates.
21	+
22	+ PRINT SHIPPING LABELS
23
24	Merchants can able get the Carrier shipping labels from soluship by any order or bulk.
25	CARRIERS WITH SOLUSHIP
26
27	create shipment by getting the predefined rates with respect to the shipment details provided by the customer, from various services such as UPS, DHL, PUROLATOR, FEDEX etc..,
28	+
29	+ There are some additional functionalities such as pick up request ,EDI import (where multiple shipments can be created by importing an edi file), Track and Search which makes the shipments user friendly.
30	+
31	*Merchants need not pay nothing for App usages. They will pay only for shipping orders in soluship.</description>
32	+ <notes>order create and print label issues fixed</notes>
33	+ <authors><author><name>selva ganesh</name><user>selva</user><email>selvaganesh26193@gmail.com</email></author></authors>
34	+ <date>2017-07-13</date>
35	+ <time>10:17:07</time>
36	+ <contents><target name="mageetc"><dir><dir name="modules"><file name="Soluship_Shipping_Magento.xml" hash="1a18096cc7c20498f4309178bc94b75b"/></dir></dir></target><target name="magecommunity"><dir><dir name="Soluship"><dir name="Shipping1"><dir name="Helper"><dir name="Data"><file name="Data.php" hash="2e5fa7cb0c497b1394f42299f977e259"/></dir></dir><dir name="Model"><file name="Data.php" hash="2e5fa7cb0c497b1394f42299f977e259"/><file name="Demo.php" hash="905d9ed0db62b4207c53fbda0e9486e7"/><file name="DimensionUnit.php" hash="9bc66802605620c4b71503d045517317"/><dir name="Dropdown"><file name="MarkupFlatOption.php" hash="c3dcad22ff96aefc5c0d8fb337b76e72"/><file name="MarkupType.php" hash="cd257aa3181386707781f56440411280"/><file name="Unitofmeasure.php" hash="40941ba42763a599ae6e2fc2f8410208"/></dir><file name="FreeShipOptions.php" hash="440c1e0121575e9f3cf2321831157eb8"/><file name="ListAttributes.php" hash="ca607f97314cff75cdeb155169288e7a"/><file name="Observer.php" hash="fe4a9d8cd951c41781f95942c552dd72"/><file name="Observer1.php" hash="7c9296454f2f339db702d0d9585b91a0"/><file name="Option.php" hash="8da2d8863b128b42344570b32d344622"/><file name="PackageOption.php" hash="5e20eeab541a8901af33bcd771e7fde9"/><dir name="Sales"><dir name="Order"><file name="Grid.php" hash="e908fb2554b19058b710b52d5fca9aa7"/><file name="View.php" hash="dde45254fe8882e85d4f8143d194b00f"/><file name="ViewTrack.php" hash="0180b81c41ea8345ac8b5f22280f8163"/></dir></dir><file name="Weightunit.php" hash="fa47f1ad50ae4f689a8ede921d9bd140"/><file name="printlabel.php" hash="feabe5cc691b088d6ade3e04d6b120fc"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="IndexController.php" hash="6ae8dc27fd286533722b6cbf25f8a9f7"/><file name="MassactionController.php" hash="715f6a5dc0b9362faf4e0cc7935db2a5"/></dir></dir><dir name="etc"><file name="config.xml" hash="8aeeac571cd04775e96182b905acf676"/><file name="system.xml" hash="c24d9cba20645e75f31a77bd48cb8d35"/></dir></dir></dir></dir></target></contents>


37	<compatible/>
38	+ <dependencies><required><php><min>5.5.0</min><max>6.0.0</max></php></required></dependencies>
39	</package>

soluship_shipping_magento - Version 1.1.2

Version Notes

Release Info

Code changes from version 1.1.0 to 1.1.2