Aramex_Shipping_Tracking_API - Version 1.0.2

Version Notes

stable

Download this release

Release Info

Developer Aramex
Extension Aramex_Shipping_Tracking_API
Version 1.0.2
Comparing to
See all releases


Code changes from version 1.0.1 to 1.0.2

app/design/adminhtml/default/default/template/sales/order/view/tab/info.phtml CHANGED
@@ -632,7 +632,7 @@
632
633
<div class="text_short">
634
<!--<label>Comment</label><input class="" type="text" id="aramex_shipment_info_comment" name="aramex_shipment_info_comment" value=""/>-->
635
- <label>Comment</label><textarea class="required" rows="4" cols="<?php if(strpos($_SERVER['HTTP_USER_AGENT'], 'Firefox')){ ?>29 <?php }else{ ?>35<?php } ?>" type="text" id="aramex_shipment_info_comment" name="aramex_shipment_info_comment"><?php echo $_SESSION['form_data']['aramex_shipment_info_comment'] ?></textarea>
636
</div>
637
638
<div class="text_short">
@@ -684,6 +684,7 @@
684
<div class="text_short">
685
<label>Description</label><textarea rows="4" cols="31" type="text" id="aramex_shipment_description" name="aramex_shipment_description" style="display: none;"><?php
686
$itemsnamecounter = 1;
687
foreach($_order->getAllVisibleItems() as $itemname){
688
if($itemname->getQtyOrdered() > $itemname->getQtyShipped()){
689
echo $itemname->getId().' - '. trim($itemname->getName());
@@ -707,8 +708,8 @@
707
}
708
}
709
}
710
-
711
- unset($_SESSION['form_data']);
712
713
?>
714
</textarea>
@@ -1222,19 +1223,60 @@
1222
});
1223
1224
jccc(".aramex_all_options").change(function(){
1225
- if(jccc("select[name=aramex_shipment_shipper_country]").val() != jccc("select[name=aramex_shipment_receiver_country]").val()){
1226
- jccc("select[name=aramex_shipment_info_product_group]").val('EXP');
1227
- //jccc("select[name=aramex_shipment_info_service_type]").val('EPX');
1228
jccc("select[name=aramex_shipment_info_additional_services] option:selected").removeAttr("selected");
1229
jccc("select[name=aramex_shipment_info_additional_services] .express_service").attr("selected", "selected");
1230
- } else {
1231
- jccc("select[name=aramex_shipment_info_product_group]").val('DOM');
1232
- //jccc("select[name=aramex_shipment_info_service_type]").val('ONP');
1233
jccc("select[name=aramex_shipment_info_additional_services] option:selected").removeAttr("selected");
1234
jccc("select[name=aramex_shipment_info_additional_services] .domestic_service").attr("selected", "selected");
1235
- }
1236
- });
1237
1238
jccc("#aramex_shipment_info_product_group_div").html(jccc("select[name=aramex_shipment_info_product_group] option:selected").text());
1239
jccc("#aramex_shipment_info_service_type_div").html(jccc("select[name=aramex_shipment_info_service_type] option:selected").text());
1240
jccc("#aramex_shipment_info_additional_services_div").html(jccc("select[name=aramex_shipment_info_additional_services] option:selected").text());
632
633
<div class="text_short">
634
<!--<label>Comment</label><input class="" type="text" id="aramex_shipment_info_comment" name="aramex_shipment_info_comment" value=""/>-->
635
+ <label>Comment</label><textarea class="required" rows="4" cols="<?php if(strpos($_SERVER['HTTP_USER_AGENT'], 'Firefox')){ ?>29 <?php }else{ ?>35<?php } ?>" type="text" id="aramex_shipment_info_comment" name="aramex_shipment_info_comment"><?php if(isset($_SESSION['form_data'])){echo $_SESSION['form_data']['aramex_shipment_info_comment'];} ?></textarea>
636
</div>
637
638
<div class="text_short">
684
<div class="text_short">
685
<label>Description</label><textarea rows="4" cols="31" type="text" id="aramex_shipment_description" name="aramex_shipment_description" style="display: none;"><?php
686
$itemsnamecounter = 1;
687
+ $item_supplier_id='';
688
foreach($_order->getAllVisibleItems() as $itemname){
689
if($itemname->getQtyOrdered() > $itemname->getQtyShipped()){
690
echo $itemname->getId().' - '. trim($itemname->getName());
708
}
709
}
710
}
711
+ if(isset($_SESSION['form_data']))
712
+ unset($_SESSION['form_data']);
713
714
?>
715
</textarea>
1223
});
1224
1225
jccc(".aramex_all_options").change(function(){
1226
+ // if(jccc("select[name=aramex_shipment_shipper_country]").val() != jccc("select[name=aramex_shipment_receiver_country]").val()){
1227
+ // jccc("select[name=aramex_shipment_info_product_group]").val('EXP');
1228
+ // //jccc("select[name=aramex_shipment_info_service_type]").val('EPX');
1229
+ // jccc("select[name=aramex_shipment_info_additional_services] option:selected").removeAttr("selected");
1230
+ // jccc("select[name=aramex_shipment_info_additional_services] .express_service").attr("selected", "selected");
1231
+ // } else {
1232
+ // jccc("select[name=aramex_shipment_info_product_group]").val('DOM');
1233
+ // //jccc("select[name=aramex_shipment_info_service_type]").val('ONP');
1234
+ // jccc("select[name=aramex_shipment_info_additional_services] option:selected").removeAttr("selected");
1235
+ // jccc("select[name=aramex_shipment_info_additional_services] .domestic_service").attr("selected", "selected");
1236
+ // }
1237
+
1238
+ });
1239
+ jccc("#aramex_shipment_info_product_group").change(function(){
1240
+ if(jccc("select[name=aramex_shipment_info_product_group]").val()=='EXP'){
1241
jccc("select[name=aramex_shipment_info_additional_services] option:selected").removeAttr("selected");
1242
jccc("select[name=aramex_shipment_info_additional_services] .express_service").attr("selected", "selected");
1243
+
1244
+ document.getElementById('aramex_shipment_info_product_type').value = 'PDX';
1245
+ document.getElementById('ONP').style.display = 'none';
1246
+ document.getElementById('OND').style.display = 'none';
1247
+ document.getElementById('CDA').style.display = 'none';
1248
+
1249
+ document.getElementById('PDX').style.display = 'block';
1250
+ document.getElementById('PPX').style.display = 'block';
1251
+ document.getElementById('PLX').style.display = 'block';
1252
+ document.getElementById('DDX').style.display = 'block';
1253
+ document.getElementById('DPX').style.display = 'block';
1254
+ document.getElementById('GDX').style.display = 'block';
1255
+ document.getElementById('GPX').style.display = 'block';
1256
+
1257
+ }else if(jccc("select[name=aramex_shipment_info_product_group]").val()=='DOM'){
1258
jccc("select[name=aramex_shipment_info_additional_services] option:selected").removeAttr("selected");
1259
jccc("select[name=aramex_shipment_info_additional_services] .domestic_service").attr("selected", "selected");
1260
1261
+ document.getElementById('aramex_shipment_info_product_type').value = 'ONP';
1262
+ document.getElementById('ONP').style.display = 'block';
1263
+ document.getElementById('OND').style.display = 'block';
1264
+ document.getElementById('CDA').style.display = 'block';
1265
+
1266
+ document.getElementById('PDX').style.display = 'none';
1267
+ document.getElementById('PPX').style.display = 'none';
1268
+ document.getElementById('PLX').style.display = 'none';
1269
+ document.getElementById('DDX').style.display = 'none';
1270
+ document.getElementById('DPX').style.display = 'none';
1271
+ document.getElementById('GDX').style.display = 'none';
1272
+ document.getElementById('GPX').style.display = 'none';
1273
+
1274
+ }
1275
+ // jccc("#aramex_shipment_info_product_group_div").html(jccc("select[name=aramex_shipment_info_product_group] option:selected").text());
1276
+ jccc("#aramex_shipment_info_service_type_div").html(jccc("select[name=aramex_shipment_info_service_type] option:selected").text());
1277
+ jccc("#aramex_shipment_info_additional_services_div").html(jccc("select[name=aramex_shipment_info_additional_services] option:selected").text());
1278
+
1279
+ });
1280
jccc("#aramex_shipment_info_product_group_div").html(jccc("select[name=aramex_shipment_info_product_group] option:selected").text());
1281
jccc("#aramex_shipment_info_service_type_div").html(jccc("select[name=aramex_shipment_info_service_type] option:selected").text());
1282
jccc("#aramex_shipment_info_additional_services_div").html(jccc("select[name=aramex_shipment_info_additional_services] option:selected").text());
app/etc/modules/Aramex_Shipment.xml ADDED
@@ -0,0 +1,9 @@
1
+ <?xml version="1.0" ?>
2
+ <config>
3
+ <modules>
4
+ <Aramex_Shipment>
5
+ <active>true</active>
6
+ <codePool>community</codePool>
7
+ </Aramex_Shipment>
8
+ </modules>
9
+ </config>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
<?xml version="1.0"?>
2
<package>
3
<name>Aramex_Shipping_Tracking_API</name>
4
- <version>1.0.1</version>
5
<stability>stable</stability>
6
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
<channel>community</channel>
8
<extends/>
9
- <summary>Stable</summary>
10
- <description>Aramex Shipping and Tracking extension</description>
11
<notes>stable</notes>
12
<authors><author><name>Aramex</name><user>Amol</user><email>Amol.Tated@aramex.com</email></author></authors>
13
- <date>2013-05-29</date>
14
- <time>09:36:37</time>
15
- <contents><target name="mageetc"><dir name="modules"><file name="Aramex_Core.xml" hash="1923b29dd7e03cf9f4f7ba9c912760da"/><file name="Aramex_Core.xml" hash="1923b29dd7e03cf9f4f7ba9c912760da"/></dir></target><target name="magecommunity"><dir name="Aramex"><dir name="Core"><file name="Aramex_Core.xml" hash="5525eb67e5f1896bd148280135936cd4"/><dir name="Helper"><file name="Data.php" hash="3e54384c862c7db8c4a8af4219c01d13"/></dir><dir name="Model"><file name="Settings.php" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="etc"><file name="config.xml" hash="f8e4095e76f0012b30f40932e2064e5b"/><file name="system.xml" hash="5c1b63745c4e019b93e973a4230dda22"/><file name="system.xml-15-Jan-2013" hash="766d98917f921e3184c824ca7e6e92ea"/><file name="system.xml-7-Jan-2013" hash="b841b80a32bc9d828593dde6db15b8b7"/></dir><file name=".DS_Store" hash="63f10aa2776f22791b4252a55c2d779d"/></dir><dir name="Shipment"><file name="Aramex_Shipment.xml" hash="a665b5ab26b59bc247a9a1b4266fd2f0"/><dir name="Block"><dir name="Sales"><dir name="Order"><file name="View.php" hash="2f8abff310d9983f4a19268464d36197"/></dir></dir></dir><dir name="Model"><dir name="Carrier"><dir name="Aramex"><dir name="Source"><file name="Dropoff.php" hash="be955005e03be4f4f07180b82191ff50"/><file name="Freemethod.php" hash="1ad34cc411b9f13b4b2a3bb91450b9b6"/><file name="Method.php" hash="ae7ebd022c95f8c6c44f4727528b7d56"/><file name="Packaging.php" hash="572a0b2c42dbbfabfd4575db08a70fc7"/></dir></dir><file name="Aramex.php" hash="ff55404d64b5f4af52f89aaa4172074f"/><file name="~$Aramex.php" hash="445a99f7ccd2d8bb7c694743b316e662"/></dir></dir><dir name="controllers"><file name="IndexController.php" hash="e3a6cdad35fe8d49fec3ad36d0c5f5cf"/><file name="ShipmentController.php" hash="cea32b347de29be31f768a98c4cc2c56"/><file name=".DS_Store" hash="fe1370d34791e3d9ade24763c3297fe3"/></dir><dir name="etc"><file name="config.xml" hash="16511eada35383d8490923f584051e2d"/></dir><file name=".DS_Store" hash="e9877719bcfec2eef994850c1f10f853"/></dir><dir name="Shipping"><dir name="Model"><dir name="Carrier"><dir name="Aramex"><dir name="Source"><file name="Dropoff.php" hash="be955005e03be4f4f07180b82191ff50"/><file name="Freemethod.php" hash="1ad34cc411b9f13b4b2a3bb91450b9b6"/><file name="Method.php" hash="ae7ebd022c95f8c6c44f4727528b7d56"/><file name="Packaging.php" hash="572a0b2c42dbbfabfd4575db08a70fc7"/></dir></dir><file name="Aramex.php" hash="aa45617cbb4dc8818539ca17e1c99317"/></dir></dir><dir name="etc"><file name="config.xml" hash="eab6a79e7730105c0b720a3976fb3511"/><file name="system.xml" hash="6691523c79d20079c96d0f6129281a5a"/></dir></dir><file name=".DS_Store" hash="9f4b17221ee140508fab9bbe1589d355"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="sales"><dir name="order"><dir name="view"><dir name="tab"><file name="info.phtml" hash="212ef6d4b41663cd37a680760ae36371"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mage"><dir name="."><dir name="aramex"><file name="desktop.ini" hash="15478b340a8362bb79fd2a6ea0dde1a0"/><file name="shipping.wsdl" hash="be4030121f0693dcb34f4e6279d24a4a"/></dir><dir name="wsdl"><file name="Tracking.wsdl" hash="d0a3decaa902f3f2b6d463c790071da8"/></dir></dir></target></contents>
16
<compatible/>
17
<dependencies><required><php><min>4.1.0</min><max>6.0.0</max></php></required></dependencies>
18
</package>
1
<?xml version="1.0"?>
2
<package>
3
<name>Aramex_Shipping_Tracking_API</name>
4
+ <version>1.0.2</version>
5
<stability>stable</stability>
6
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
<channel>community</channel>
8
<extends/>
9
+ <summary> This extension allows you to prepare shipments and track their status through the admin portal of Magento. </summary>
10
+ <description>Aramex Shipping and Tracking Extension allows direct communication between the admin portal of Magento Store and Aramex Shipping and Tracking Systems. This extension requires that you have an Aramex account and complete the account information in the Aramex Global Settings. </description>
11
<notes>stable</notes>
12
<authors><author><name>Aramex</name><user>Amol</user><email>Amol.Tated@aramex.com</email></author></authors>
13
+ <date>2013-06-10</date>
14
+ <time>13:22:34</time>
15
+ <contents><target name="mageetc"><dir name="modules"><file name="Aramex_Core.xml" hash="1923b29dd7e03cf9f4f7ba9c912760da"/><file name="Aramex_Shipment.xml" hash="d8b92ad1085dfbabe168748f2f4a8bb0"/></dir></target><target name="magecommunity"><dir name="Aramex"><dir name="Core"><file name="Aramex_Core.xml" hash="5525eb67e5f1896bd148280135936cd4"/><dir name="Helper"><file name="Data.php" hash="3e54384c862c7db8c4a8af4219c01d13"/></dir><dir name="Model"><file name="Settings.php" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="etc"><file name="config.xml" hash="f8e4095e76f0012b30f40932e2064e5b"/><file name="system.xml" hash="5c1b63745c4e019b93e973a4230dda22"/><file name="system.xml-15-Jan-2013" hash="766d98917f921e3184c824ca7e6e92ea"/><file name="system.xml-7-Jan-2013" hash="b841b80a32bc9d828593dde6db15b8b7"/></dir><file name=".DS_Store" hash="63f10aa2776f22791b4252a55c2d779d"/></dir><dir name="Shipment"><file name="Aramex_Shipment.xml" hash="a665b5ab26b59bc247a9a1b4266fd2f0"/><dir name="Block"><dir name="Sales"><dir name="Order"><file name="View.php" hash="2f8abff310d9983f4a19268464d36197"/></dir></dir></dir><dir name="Model"><dir name="Carrier"><dir name="Aramex"><dir name="Source"><file name="Dropoff.php" hash="be955005e03be4f4f07180b82191ff50"/><file name="Freemethod.php" hash="1ad34cc411b9f13b4b2a3bb91450b9b6"/><file name="Method.php" hash="ae7ebd022c95f8c6c44f4727528b7d56"/><file name="Packaging.php" hash="572a0b2c42dbbfabfd4575db08a70fc7"/></dir></dir><file name="Aramex.php" hash="ff55404d64b5f4af52f89aaa4172074f"/><file name="~$Aramex.php" hash="445a99f7ccd2d8bb7c694743b316e662"/></dir></dir><dir name="controllers"><file name="IndexController.php" hash="e3a6cdad35fe8d49fec3ad36d0c5f5cf"/><file name="ShipmentController.php" hash="cea32b347de29be31f768a98c4cc2c56"/><file name=".DS_Store" hash="fe1370d34791e3d9ade24763c3297fe3"/></dir><dir name="etc"><file name="config.xml" hash="16511eada35383d8490923f584051e2d"/></dir><file name=".DS_Store" hash="e9877719bcfec2eef994850c1f10f853"/></dir><dir name="Shipping"><dir name="Model"><dir name="Carrier"><dir name="Aramex"><dir name="Source"><file name="Dropoff.php" hash="be955005e03be4f4f07180b82191ff50"/><file name="Freemethod.php" hash="1ad34cc411b9f13b4b2a3bb91450b9b6"/><file name="Method.php" hash="ae7ebd022c95f8c6c44f4727528b7d56"/><file name="Packaging.php" hash="572a0b2c42dbbfabfd4575db08a70fc7"/></dir></dir><file name="Aramex.php" hash="aa45617cbb4dc8818539ca17e1c99317"/></dir></dir><dir name="etc"><file name="config.xml" hash="eab6a79e7730105c0b720a3976fb3511"/><file name="system.xml" hash="6691523c79d20079c96d0f6129281a5a"/></dir></dir><file name=".DS_Store" hash="9f4b17221ee140508fab9bbe1589d355"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="sales"><dir name="order"><dir name="view"><dir name="tab"><file name="info.phtml" hash="fe335994ca4e21238e5165f384a01f48"/></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mage"><dir name="."><dir name="aramex"><file name="desktop.ini" hash="15478b340a8362bb79fd2a6ea0dde1a0"/><file name="shipping.wsdl" hash="be4030121f0693dcb34f4e6279d24a4a"/></dir><dir name="wsdl"><file name="Tracking.wsdl" hash="d0a3decaa902f3f2b6d463c790071da8"/></dir></dir></target></contents>
16
<compatible/>
17
<dependencies><required><php><min>4.1.0</min><max>6.0.0</max></php></required></dependencies>
18
</package>