Version Notes
1.8.1.0
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Lib_Js_Mage |
| Version | 1.8.1.0 |
| Comparing to | |
| See all releases | |
Code changes from version 1.8.0.0 to 1.8.1.0
- js/mage/adminhtml/sales.js +23 -9
- js/mage/adminhtml/sales/packaging.js +1 -1
- js/varien/form.js +1 -0
- package.xml +5 -5
js/mage/adminhtml/sales.js
CHANGED
|
@@ -204,24 +204,38 @@ AdminOrder.prototype = {
|
|
| 204 |
}
|
| 205 |
data = data.toObject();
|
| 206 |
|
| 207 |
-
if( (type == 'billing' && this.shippingAsBilling)
|
| 208 |
-
|| (type == 'shipping' && !this.shippingAsBilling) ) {
|
| 209 |
data['reset_shipping'] = true;
|
| 210 |
}
|
| 211 |
|
| 212 |
data['order['+type+'_address][customer_address_id]'] = $('order-'+type+'_address_customer_address_id').value;
|
| 213 |
|
|
|
|
|
|
|
|
|
|
|
|
|
| 214 |
if (data['reset_shipping']) {
|
| 215 |
-
this.turnOffShippingFields();
|
| 216 |
this.resetShippingMethod(data);
|
| 217 |
-
}
|
| 218 |
-
else {
|
| 219 |
this.saveData(data);
|
| 220 |
-
if (name == 'country_id' || name == 'customer_address_id') {
|
| 221 |
this.loadArea(['shipping_method', 'billing_method', 'totals', 'items'], true, data);
|
| 222 |
}
|
| 223 |
-
|
| 224 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 225 |
}
|
| 226 |
},
|
| 227 |
|
|
@@ -325,7 +339,7 @@ AdminOrder.prototype = {
|
|
| 325 |
resetShippingMethod : function(data){
|
| 326 |
data['reset_shipping'] = 1;
|
| 327 |
this.isShippingMethodReseted = true;
|
| 328 |
-
this.loadArea(['shipping_method', 'billing_method', '
|
| 329 |
},
|
| 330 |
|
| 331 |
loadShippingRates : function(){
|
| 204 |
}
|
| 205 |
data = data.toObject();
|
| 206 |
|
| 207 |
+
if( (type == 'billing' && this.shippingAsBilling && !this.isShippingMethodReseted)
|
| 208 |
+
|| (type == 'shipping' && !this.shippingAsBilling && !this.isShippingMethodReseted) ) {
|
| 209 |
data['reset_shipping'] = true;
|
| 210 |
}
|
| 211 |
|
| 212 |
data['order['+type+'_address][customer_address_id]'] = $('order-'+type+'_address_customer_address_id').value;
|
| 213 |
|
| 214 |
+
if (type == 'billing' && this.shippingAsBilling) {
|
| 215 |
+
this.copyDataFromBillingToShipping(field);
|
| 216 |
+
}
|
| 217 |
+
|
| 218 |
if (data['reset_shipping']) {
|
|
|
|
| 219 |
this.resetShippingMethod(data);
|
| 220 |
+
} else {
|
|
|
|
| 221 |
this.saveData(data);
|
| 222 |
+
if (!this.isShippingMethodReseted && (name == 'country_id' || name == 'customer_address_id')) {
|
| 223 |
this.loadArea(['shipping_method', 'billing_method', 'totals', 'items'], true, data);
|
| 224 |
}
|
| 225 |
+
}
|
| 226 |
+
},
|
| 227 |
+
|
| 228 |
+
copyDataFromBillingToShipping : function(field) {
|
| 229 |
+
var shippingId = $(field).identify().replace('-billing_', '-shipping_');
|
| 230 |
+
var inputField = $(shippingId);
|
| 231 |
+
if (inputField) {
|
| 232 |
+
inputField.setValue($(field).getValue());
|
| 233 |
+
if (inputField.changeUpdater) {
|
| 234 |
+
inputField.changeUpdater();
|
| 235 |
+
}
|
| 236 |
+
$(this.shippingAddressContainer).select('select').each(function(el){
|
| 237 |
+
el.disable();
|
| 238 |
+
});
|
| 239 |
}
|
| 240 |
},
|
| 241 |
|
| 339 |
resetShippingMethod : function(data){
|
| 340 |
data['reset_shipping'] = 1;
|
| 341 |
this.isShippingMethodReseted = true;
|
| 342 |
+
this.loadArea(['shipping_method', 'billing_method', 'totals', 'giftmessage', 'items'], true, data);
|
| 343 |
},
|
| 344 |
|
| 345 |
loadShippingRates : function(){
|
js/mage/adminhtml/sales/packaging.js
CHANGED
|
@@ -139,7 +139,7 @@ Packaging.prototype = {
|
|
| 139 |
height = parseFloat(pack.select('input[name="container_height"]')[0].value);
|
| 140 |
packagesParams[packageId] = {
|
| 141 |
container: pack.select('select[name="package_container"]')[0].value,
|
| 142 |
-
customs_value:
|
| 143 |
weight: isNaN(weight) ? '' : weight,
|
| 144 |
length: isNaN(length) ? '' : length,
|
| 145 |
width: isNaN(width) ? '' : width,
|
| 139 |
height = parseFloat(pack.select('input[name="container_height"]')[0].value);
|
| 140 |
packagesParams[packageId] = {
|
| 141 |
container: pack.select('select[name="package_container"]')[0].value,
|
| 142 |
+
customs_value: parseFloat(pack.select('input[name="package_customs_value"]')[0].value, 10),
|
| 143 |
weight: isNaN(weight) ? '' : weight,
|
| 144 |
length: isNaN(length) ? '' : length,
|
| 145 |
width: isNaN(width) ? '' : width,
|
js/varien/form.js
CHANGED
|
@@ -356,6 +356,7 @@ ZipUpdater.prototype = {
|
|
| 356 |
|
| 357 |
// Ajax-request and normal content load compatibility
|
| 358 |
if (this.zipElement != undefined) {
|
|
|
|
| 359 |
this._setPostcodeOptional();
|
| 360 |
} else {
|
| 361 |
Event.observe(window, "load", this._setPostcodeOptional.bind(this));
|
| 356 |
|
| 357 |
// Ajax-request and normal content load compatibility
|
| 358 |
if (this.zipElement != undefined) {
|
| 359 |
+
Validation.reset(this.zipElement)
|
| 360 |
this._setPostcodeOptional();
|
| 361 |
} else {
|
| 362 |
Event.observe(window, "load", this._setPostcodeOptional.bind(this));
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Lib_Js_Mage</name>
|
| 4 |
-
<version>1.8.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>Mixed</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>Javascript Libraries for Magento</summary>
|
| 10 |
<description>Javascript Libraries for Magento</description>
|
| 11 |
-
<notes>1.8.
|
| 12 |
<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
|
| 13 |
-
<date>2013-
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="mageweb"><dir name="js"><dir name="lib"><file name="
|
| 16 |
<compatible/>
|
| 17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Lib_Js_Prototype</name><channel>community</channel><min>1.7.0.0.4</min><max>1.7.1.0</max></package></required></dependencies>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Lib_Js_Mage</name>
|
| 4 |
+
<version>1.8.1.0</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license>Mixed</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>Javascript Libraries for Magento</summary>
|
| 10 |
<description>Javascript Libraries for Magento</description>
|
| 11 |
+
<notes>1.8.1.0</notes>
|
| 12 |
<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
|
| 13 |
+
<date>2013-11-22</date>
|
| 14 |
+
<time>04:16:48</time>
|
| 15 |
+
<contents><target name="mageweb"><dir name="js"><dir name="lib"><file name="FABridge.js" hash="64244d8d58abd42bd71f0ee3309767ad"/><file name="boxover.js" hash="a5ade77452e8d5066cb84dcac3d34ed5"/><file name="ccard.js" hash="d3e849be0977d53de4af933b40293ff6"/><file name="dropdown.js" hash="59f4f83e1dabf0a755e563f352ca897d"/><file name="ds-sleight.js" hash="85af457d444865d1587bfe4875bd4fc6"/><file name="flex.js" hash="2833054f3e3040e98014621b60bbbb85"/></dir><dir name="mage"><dir name="adminhtml"><file name="accordion.js" hash="b6161df7432f44074a240295ece00532"/><file name="backup.js" hash="28cb096d1f81542b314a36e0bca8638c"/><file name="browser.js" hash="79a10c4a78aa109efe0c96fec10c885f"/><file name="events.js" hash="732067f6a9ee289849901daf650e7279"/><file name="flexuploader.js" hash="46eb45e3285df0e1eac97a5112e753b3"/><file name="form.js" hash="2db66b43acabc8e3ec13ac84a95f3c5c"/><file name="giftmessage.js" hash="a552774c6b91722bc7d525f603e20cc1"/><dir name="giftoptions"><file name="tooltip.js" hash="07d82234a7680e7222e6b2ac667caed7"/></dir><file name="grid.js" hash="822246fc687e2164680a6587ea2f4ce8"/><file name="hash.js" hash="7ef7287161eda370f5856eeb8b40b91d"/><file name="image.js" hash="1f71519a2eb2326acef74fa2defe2d73"/><file name="loader.js" hash="8bdf6c1bc16c458711ca3597922931b0"/><file name="magento-all.js" hash="3d521110ba9afbbffcb20e4238c62b11"/><dir name="product"><dir name="composite"><file name="configure.js" hash="a9bd5bbc7a7619fffd859aa8b7d0a2d2"/></dir></dir><file name="product.js" hash="000826460eca2d405b98ef57a4890bf3"/><file name="rules.js" hash="a827fe4f2bdaea5fe0dcac206c958355"/><dir name="sales"><file name="packaging.js" hash="d474d5b74d9514dafb8ebc527f89dbf0"/></dir><file name="sales.js" hash="5656a8c1c646afaaf260a130fe405691"/><file name="scrollbar.js" hash="2b303f431f23ff6b58bafeb6599c97aa"/><file name="tabs.js" hash="6b912991ccb7805b5038b633a435de00"/><file name="tools.js" hash="c5f8f2f8c69ca53546a966065cca5d9e"/><file name="uploader.js" hash="ef900af8fd343fee143abafbc42b2da8"/><file name="variables.js" hash="0d3a859eaa32b35f048bf946fd496244"/><dir name="wysiwyg"><dir name="tiny_mce"><dir name="plugins"><dir name="magentovariable"><file name="editor_plugin.js" hash="33aa3999aec905d1f32199426ad78570"/><dir name="img"><file name="icon.gif" hash="682b29a0e734f952cb2edabede6a25d1"/></dir></dir><dir name="magentowidget"><file name="editor_plugin.js" hash="7e3cc1adc243559bf55d9eb4c836aec8"/><dir name="img"><file name="icon.gif" hash="532c141286373f098f1f4362e001c7f8"/></dir></dir></dir><file name="setup.js" hash="58bff8b95d60c93efd8d686e35b7a2b9"/><dir name="themes"><dir name="advanced"><dir name="skins"><dir name="default"><file name="content.css" hash="787fd97c0640646b1a471b3b84b559fe"/><file name="dialog.css" hash="70c98cab1e2eef43ca68429720f946b0"/></dir></dir></dir></dir></dir><file name="widget.js" hash="48dd1877b3731a775c8a41d1981e339e"/></dir></dir><file name="captcha.js" hash="ff5ecf8cf78c4cc1b2a61157878d1913"/><file name="centinel.js" hash="aa8036d10159786454413df2b3dba6bd"/><file name="cookies.js" hash="3b9f031ab2859f553bac1dcee4614cad"/><file name="directpost.js" hash="43c9ce054295bd2bf99272d3a21ffcb5"/><file name="translate.js" hash="33fd17d71ec8ef4ee1de5f10a69d0b7d"/><file name="translate_inline.css" hash="6adbdc441637a5ec8409e4272309df35"/><file name="translate_inline.js" hash="af5ab4a6192b9f30aa76c3bbbdb9dc2c"/></dir><dir name="varien"><file name="accordion.js" hash="9e2631995ce93f0c905b14a5c831b441"/><file name="configurable.js" hash="11e2fc14a2f3a09c2dffdc57b6f72fe3"/><file name="form.js" hash="8ec166d5e7afdb268f5a230b0c2d917b"/><file name="iehover-fix.js" hash="3c6179bd66597c07fe825798a3606ce3"/><file name="js.js" hash="fff0a9a07982c134d54b5b00c0c8884c"/><file name="menu.js" hash="6a914283a1414a66771bc915f4ca9dd9"/><file name="payment.js" hash="09eba80d26ae8fda53fdb6b296a1fa62"/><file name="product.js" hash="90ab2ca1e4303cc4ba3e41140b038f68"/><file name="telephone.js" hash="d3cead00e1fd7c1d805cad8cd2fbaada"/><file name="weee.js" hash="b743eab978648fbf67c2e99baa756ab8"/></dir><file name="blank.html" hash="d41d8cd98f00b204e9800998ecf8427e"/><file name="index.php" hash="9a76023de59c1958cac0473ef31efa26"/><file name="spacer.gif" hash="df3e567d6f16d040326c7a0ea29a4f41"/><dir name="flash"><file name="AC_RunActiveContent.js" hash="3e038cea960c1b650442b85cea237053"/></dir></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php><package><name>Lib_Js_Prototype</name><channel>community</channel><min>1.7.0.0.4</min><max>1.7.1.0</max></package></required></dependencies>
|
| 18 |
</package>
|
