-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Improvements to quotation in product page.
- Loading branch information
1 parent
c8e489f
commit 1b662b0
Showing
9 changed files
with
226 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,17 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| /** | ||
| * Frenet Shipping Gateway | ||
| * | ||
| * @category Frenet | ||
| * | ||
| * @author Tiago Sampaio <[email protected]> | ||
| * @link https://github.com/tiagosampaio | ||
| * @link https://tiagosampaio.com | ||
| * | ||
| * Copyright (c) 2020. | ||
| */ | ||
| --> | ||
| <config> | ||
| <modules> | ||
| <Frenet_Shipping> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| <?xml version="1.0"?> | ||
| <jstranslator> | ||
| <delivery-time translate="message" module="frenet_shipping"> | ||
| <message> day(s)</message> | ||
| </delivery-time> | ||
| </jstranslator> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,17 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| /** | ||
| * Frenet Shipping Gateway | ||
| * | ||
| * @category Frenet | ||
| * | ||
| * @author Tiago Sampaio <[email protected]> | ||
| * @link https://github.com/tiagosampaio | ||
| * @link https://tiagosampaio.com | ||
| * | ||
| * Copyright (c) 2020. | ||
| */ | ||
| --> | ||
| <config> | ||
| <sections> | ||
| <carriers> | ||
|
|
||
18 changes: 18 additions & 0 deletions
18
app/design/frontend/base/default/layout/frenet/frenet_shipping.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,24 @@ | ||
| <?xml version="1.0"?> | ||
| <!-- | ||
| /** | ||
| * Frenet Shipping Gateway | ||
| * | ||
| * @category Frenet | ||
| * | ||
| * @author Tiago Sampaio <[email protected]> | ||
| * @link https://github.com/tiagosampaio | ||
| * @link https://tiagosampaio.com | ||
| * | ||
| * Copyright (c) 2020. | ||
| */ | ||
| --> | ||
| <layout version="0.1.0"> | ||
| <frenet_product_shipping_quote> | ||
| <reference name="head"> | ||
| <action method="addJs"><script>varien/js.js</script></action> | ||
| <action method="addItem"><type>skin_js</type><name>js/frenet/shipping.js</name></action> | ||
| <action method="addItem"><type>skin_css</type><name>css/frenet/shipping.css</name></action> | ||
| </reference> | ||
| <block type="frenet_shipping/catalog_product_view_quote" name="product.info.frenet.shipping.quote" as="frenet.shipping.quote" template="frenet/shipping/catalog/product/view/quote.phtml"> | ||
| </block> | ||
| <reference name="product.info.extrahint"> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| /** | ||
| * Frenet Shipping Gateway | ||
| * | ||
| * @category Frenet | ||
| * | ||
| * @author Tiago Sampaio <[email protected]> | ||
| * @link https://github.com/tiagosampaio | ||
| * @link https://tiagosampaio.com | ||
| * | ||
| * Copyright (c) 2020. | ||
| */ | ||
|
|
||
| .box-frenet-quote { | ||
| margin: 20px 0; | ||
| } | ||
|
|
||
| .box-frenet-quote .data-table { | ||
| margin: 20px 0; | ||
| } | ||
|
|
||
| .box-frenet-quote .field { | ||
| margin-top: 10px; | ||
| } | ||
|
|
||
| .box-frenet-quote .field .postcode { | ||
| margin: 10px 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| /** | ||
| * Frenet Shipping Gateway | ||
| * | ||
| * @category Frenet | ||
| * | ||
| * @author Tiago Sampaio <[email protected]> | ||
| * @link https://github.com/tiagosampaio | ||
| * @link https://tiagosampaio.com | ||
| * | ||
| * Copyright (c) 2020. | ||
| */ | ||
|
|
||
| var ProductQuote = Class.create(); | ||
| ProductQuote.prototype = { | ||
| initialize: function (config) { | ||
| this.url = '/frenet/product/quote'; | ||
| this.postcode = null; | ||
| this.active = false; | ||
| this.field = $('frenet-postcode-field'); | ||
| this.button = $('frenet-postcode-button'); | ||
| this.table = $('frenet-result-table'); | ||
| this.tableBody = $('frenet-result-table-body'); | ||
| this.errorMessage = null; | ||
| this.priceFormat = config.priceFormat; | ||
|
|
||
| this.field.observe('change', this.check.bind(this)); | ||
| this.button.observe('click', this.updateRates.bind(this)); | ||
| this.disable(); | ||
| }, | ||
| check: function () { | ||
| if (this.field.value.length === 0) { | ||
| this.disable(); | ||
| this.reset(); | ||
| return; | ||
| } | ||
|
|
||
| this.enable(); | ||
| }, | ||
| reset: function () { | ||
| this.table.hide(); | ||
| this.tableBody.update(''); | ||
| }, | ||
| updateRates: function () { | ||
| this.postcode = this.field.value; | ||
| this.reset(); | ||
|
|
||
| if (this.postcode) { | ||
| // this.loaderStart(); | ||
|
|
||
| new Ajax.Request(this.url, { | ||
| method: 'POST', | ||
| parameters: $('product_addtocart_form').serialize(), | ||
| onSuccess: this.processSuccess.bind(this), | ||
| onFailure: this.processFailure.bind(this), | ||
| onComplete: this.processAlways.bind(this) | ||
| }); | ||
| } | ||
|
|
||
| if (!this.postcode) { | ||
| } | ||
| }, | ||
| processSuccess: function (result) { | ||
| // console.log("RESULT SUCCESS", result); | ||
| var response = result.responseJSON; | ||
|
|
||
| if (response.error) { | ||
| this.processFailure(result); | ||
| return; | ||
| } | ||
|
|
||
| this.pushRates(response.rates); | ||
| }, | ||
| processFailure: function (result) { | ||
| // console.log("RESULT FAILURE", result); | ||
| // this.reset(); | ||
| this.errorMessage(result.message); | ||
| // this.error(true); | ||
| }, | ||
| processAlways: function (result) { | ||
| console.log("RESULT ALWAYS", result); | ||
| this.table.show(); | ||
| // this.loaderStop(); | ||
| }, | ||
| pushRates: function (rates) { | ||
| var Rates = $A(rates); | ||
|
|
||
| if (Rates.size() <= 0) { | ||
| return; | ||
| // this.visible(true); | ||
| // this.error(false); | ||
| // this.deactivate(); | ||
| } | ||
|
|
||
| Rates.each(this.appendRate.bind(this)); | ||
|
|
||
| // if (rates.length === 0) { | ||
| // this.visible(false); | ||
| // } | ||
|
|
||
| // this.displayNoResults(!this.visible()); | ||
| }, | ||
| appendRate: function (rate, index) { | ||
| var row = new Element('tr'); | ||
| this.createColumn(row, rate.service_description); | ||
| this.createColumn(row, this.formatDeliveryTime(rate.delivery_time)); | ||
| this.createColumn(row, this.formatPrice(rate.shipping_price)); | ||
| this.tableBody.appendChild(row); | ||
| }, | ||
| createColumn: function (row, text) { | ||
| row.appendChild(new Element('td').update(text)) | ||
| }, | ||
| formatDeliveryTime: function (days) { | ||
| return days + Translator.translate(' day(s)') | ||
| }, | ||
| formatPrice: function (price) { | ||
| return formatCurrency(price, this.priceFormat); | ||
| }, | ||
| disable: function () { | ||
| this.button.addClassName('disabled'); | ||
| }, | ||
| enable: function () { | ||
| this.button.removeClassName('disabled'); | ||
| } | ||
| } |