thirdparty
/
CybroAddons
mirror of https://github.com/CybroOdoo/CybroAddons.git
5
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Nov 3 : [FIX] Bug Fixed 'call_for_price_website'

pull/295/head
AjmalCybro 2 years ago
parent
0dba3f86fc
commit
b1398e050f
5 changed files with 226 additions and 170 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      call_for_price_website/__manifest__.py
  2. 16
      call_for_price_website/static/src/js/variant_mixin.js
  3. 2
      call_for_price_website/views/compare_hide_price_template.xml
  4. 112
      call_for_price_website/views/shop_hide_call_price_template.xml
  5. 12
      call_for_price_website/views/wishlist_hide_price_template.xml

2
call_for_price_website/__manifest__.py
View File

@ -21,7 +21,7 @@
############################################################################### ###############################################################################
{ {
'name': 'Website Call For Price', 'name': 'Website Call For Price',
'version': '16.0.1.0.1', 'version': '16.0.2.0.0',
'category': 'Website', 'category': 'Website',
'author': 'Cybrosys Techno Solutions', 'author': 'Cybrosys Techno Solutions',
'company': 'Cybrosys Techno Solutions', 'company': 'Cybrosys Techno Solutions',

16
call_for_price_website/static/src/js/variant_mixin.js
View File

@ -49,9 +49,11 @@ odoo.define('call_for_price_website.CustomVariantMixin', function(require) {
addToCart.removeClass('d-inline-flex').addClass('d-none'); addToCart.removeClass('d-inline-flex').addClass('d-none');
contactUsButton.removeClass('d-none').addClass('d-flex'); contactUsButton.removeClass('d-none').addClass('d-flex');
price_call_div.removeClass('d-none').addClass('d-flex'); price_call_div.removeClass('d-none').addClass('d-flex');
this.$el.find('#add_to_cart')[0].style.display = "none"; this.$el.find('#add_to_cart').removeClass('d-block').addClass('d-none');
this.$el.find('#price_of_product')[0].style.display = "none"; this.$el.find('#price_of_product').removeClass('d-block').addClass('d-none');
this.$el.find('#price_of_product')[0].style.display = "none"; this.$el.find('#price_of_product').removeClass('d-block').addClass('d-none');
this.$el.find('.js_add_cart_json').removeClass('d-block').addClass('d-none');
this.$el.find('.quantity').removeClass('d-block').addClass('d-none');
} else { } else {
productPrice.removeClass('d-none').addClass('d-inline-block'); productPrice.removeClass('d-none').addClass('d-inline-block');
quantity.removeClass('d-none').addClass('d-inline-flex'); quantity.removeClass('d-none').addClass('d-inline-flex');
@ -59,9 +61,11 @@ odoo.define('call_for_price_website.CustomVariantMixin', function(require) {
contactUsButton.removeClass('d-flex').addClass('d-none'); contactUsButton.removeClass('d-flex').addClass('d-none');
product_unavailable.removeClass('d-flex').addClass('d-none') product_unavailable.removeClass('d-flex').addClass('d-none')
price_call_div.removeClass('d-flex').addClass('d-none') price_call_div.removeClass('d-flex').addClass('d-none')
this.$el.find('#add_to_cart')[0].style.display = "block"; this.$el.find('#add_to_cart').removeClass('d-none').addClass('d-block');
this.$el.find('#price_of_product')[0].style.display = "block"; this.$el.find('#price_of_product').removeClass('d-none').addClass('d-block');
this.$el.find('#price_of_product')[0].style.display = "block"; this.$el.find('#price_of_product').removeClass('d-none').addClass('d-block');
this.$el.find('.js_add_cart_json').removeClass('d-none').addClass('d-block');
this.$el.find('.quantity').removeClass('d-none').addClass('d-block');
} }
// Call the original onChangeCombination function // Call the original onChangeCombination function
originalOnChangeCombination.apply(this, [ev, $parent, combination]); originalOnChangeCombination.apply(this, [ev, $parent, combination]);

2
call_for_price_website/views/compare_hide_price_template.xml
View File

@ -2,6 +2,7 @@
<odoo> <odoo>
<!-- This template used to hide the price form the comparison page--> <!-- This template used to hide the price form the comparison page-->
<template id="compare_hide_price" inherit_id="website_sale_comparison.product_compare"> <template id="compare_hide_price" inherit_id="website_sale_comparison.product_compare">
<t t-call="website.layout">
<xpath expr="//span[hasclass('o_comparison_price')]" position="replace"> <xpath expr="//span[hasclass('o_comparison_price')]" position="replace">
<t t-if="product.price_call"></t> <t t-if="product.price_call"></t>
</xpath> </xpath>
@ -21,6 +22,7 @@
</form> </form>
</t> </t>
</xpath> </xpath>
</t>
</template> </template>
<!-- This template used to hide price from product comparison tool page--> <!-- This template used to hide price from product comparison tool page-->
<template id="compare_hide_price_product" inherit_id="website_sale_comparison.product_product"> <template id="compare_hide_price_product" inherit_id="website_sale_comparison.product_product">

112
call_for_price_website/views/shop_hide_call_price_template.xml
View File

@ -6,14 +6,19 @@
<t t-foreach="product.product_variant_ids" t-as="variant"> <t t-foreach="product.product_variant_ids" t-as="variant">
<t t-if="variant.price_call"> <t t-if="variant.price_call">
<t t-set="has_price_call" t-value="True"/> <t t-set="has_price_call" t-value="True"/>
<t t-break="1"/></t> <t t-break="1"/>
</t>
</t> </t>
<t t-if="has_price_call"></t> <t t-if="has_price_call"></t>
<t t-else=""> <t t-else="">
<div class="product_price" itemprop="offers" itemscope="itemscope" itemtype="http://schema.org/Offer"> <div class="product_price" itemprop="offers"
itemscope="itemscope"
itemtype="http://schema.org/Offer">
<t t-if="'base_price' in template_price_vals"> <t t-if="'base_price' in template_price_vals">
<del t-attf-class="text-muted me-1 h6 mb-0" style="white-space: nowrap;"> <del t-attf-class="text-muted me-1 h6 mb-0"
<em class="small" t-esc="template_price_vals['base_price']" style="white-space: nowrap;">
<em class="small"
t-esc="template_price_vals['base_price']"
t-options="{'widget': 'monetary', 'display_currency': website.currency_id}"/> t-options="{'widget': 'monetary', 'display_currency': website.currency_id}"/>
</del> </del>
</t> </t>
@ -21,9 +26,12 @@
t-if="template_price_vals['price_reduce'] or not website.prevent_zero_price_sale" t-if="template_price_vals['price_reduce'] or not website.prevent_zero_price_sale"
t-esc="template_price_vals['price_reduce']" t-esc="template_price_vals['price_reduce']"
t-options="{'widget': 'monetary', 'display_currency': website.currency_id}"/> t-options="{'widget': 'monetary', 'display_currency': website.currency_id}"/>
<span class="h6 mb-0" t-else="" t-field="website.prevent_zero_price_sale_text"/> <span class="h6 mb-0" t-else=""
<span itemprop="price" style="display:none;" t-esc="template_price_vals['price_reduce']"/> t-field="website.prevent_zero_price_sale_text"/>
<span itemprop="priceCurrency" style="display:none;" t-esc="website.currency_id.name"/> <span itemprop="price" style="display:none;"
t-esc="template_price_vals['price_reduce']"/>
<span itemprop="priceCurrency" style="display:none;"
t-esc="website.currency_id.name"/>
</div> </div>
</t> </t>
</xpath> </xpath>
@ -37,17 +45,26 @@
<!-- Template for product price display --> <!-- Template for product price display -->
<template id="product_price" inherit_id="website_sale.product_price"> <template id="product_price" inherit_id="website_sale.product_price">
<xpath expr="//div[@itemprop='offers']" position="replace"> <xpath expr="//div[@itemprop='offers']" position="replace">
<div itemprop="offers" itemscope="itemscope" itemtype="http://schema.org/Offer" t-attf-class="product_price mt-2 mb-3 {{'d-none' if combination_info['prevent_zero_price_sale'] else 'd-inline-block'}}"> <div itemprop="offers" itemscope="itemscope"
itemtype="http://schema.org/Offer"
t-attf-class="product_price mt-2 mb-3 {{'d-none' if combination_info['prevent_zero_price_sale'] else 'd-inline-block'}}">
<h3 class="css_editable_mode_hidden" id="price_of_product"> <h3 class="css_editable_mode_hidden" id="price_of_product">
<span class="oe_price" style="white-space: nowrap;" t-esc="combination_info['price']" t-options="{'widget': 'monetary', 'display_currency': website.currency_id}"/> <span class="oe_price" style="white-space: nowrap;"
<span itemprop="price" style="display:none;" t-esc="combination_info['price']"/> t-esc="combination_info['price']"
<span itemprop="priceCurrency" style="display:none;" t-esc="website.currency_id.name"/> t-options="{'widget': 'monetary', 'display_currency': website.currency_id}"/>
<span t-attf-class="text-danger oe_default_price ms-1 h5 {{'' if combination_info['has_discounted_price'] else 'd-none'}}" style="text-decoration: line-through; white-space: nowrap;" <span itemprop="price" style="display:none;"
t-esc="combination_info['list_price']" t-options="{'widget': 'monetary', 'display_currency': website.currency_id}" t-esc="combination_info['price']"/>
<span itemprop="priceCurrency" style="display:none;"
t-esc="website.currency_id.name"/>
<span t-attf-class="text-danger oe_default_price ms-1 h5 {{'' if combination_info['has_discounted_price'] else 'd-none'}}"
style="text-decoration: line-through; white-space: nowrap;"
t-esc="combination_info['list_price']"
t-options="{'widget': 'monetary', 'display_currency': website.currency_id}"
itemprop="listPrice" itemprop="listPrice"
/> />
<t t-esc="product_id"/> <t t-esc="product_id"/>
<t t-if="is_view_active('website_sale.tax_indication')" t-call="website_sale.tax_indication"/> <t t-if="is_view_active('website_sale.tax_indication')"
t-call="website_sale.tax_indication"/>
<del t-if="product.compare_list_price"> <del t-if="product.compare_list_price">
<bdi dir="inherit"> <bdi dir="inherit">
<span t-field="product.compare_list_price" <span t-field="product.compare_list_price"
@ -58,12 +75,16 @@
</bdi> </bdi>
</del> </del>
</h3> </h3>
<h3 id="price_of_products" class="css_non_editable_mode_hidden decimal_precision" t-att-data-precision="str(website.currency_id.decimal_places)" style="display:none"> <h3 id="price_of_products"
class="css_non_editable_mode_hidden decimal_precision"
t-att-data-precision="str(website.currency_id.decimal_places)"
style="display:none">
<span t-field="product.list_price" <span t-field="product.list_price"
t-options='{"widget": "monetary", t-options='{"widget": "monetary",
"display_currency": product.currency_id, "display_currency": product.currency_id,
}'/> }'/>
<t t-if="is_view_active('website_sale.tax_indication')" t-call="website_sale.tax_indication"/> <t t-if="is_view_active('website_sale.tax_indication')"
t-call="website_sale.tax_indication"/>
<del t-if="product.compare_list_price"> <del t-if="product.compare_list_price">
<bdi dir="inherit"> <bdi dir="inherit">
<span t-field="product.compare_list_price" <span t-field="product.compare_list_price"
@ -75,16 +96,20 @@
</del> </del>
</h3> </h3>
</div> </div>
<div id="product_unavailable" t-attf-class="{{'d-flex' if combination_info['prevent_zero_price_sale'] else 'd-none'}}"> <div id="product_unavailable"
<h3 class="fst-italic" t-field="website.prevent_zero_price_sale_text"/> t-attf-class="{{'d-flex' if combination_info['prevent_zero_price_sale'] else 'd-none'}}">
<h3 class="fst-italic"
t-field="website.prevent_zero_price_sale_text"/>
</div> </div>
<div id="price_call_hide" style="display:none"> <div id="price_call_hide" style="display:none">
<div> <div>
<div class="alert alert-success" id="alert_message" <div class="alert alert-success" id="alert_message"
style="display:none"> style="display:none">
Thank you for information, we will get back to you asap. Thank you for information, we will get back to you
asap.
</div> </div>
<a role="button" class="btn btn-primary" href="#call_for_price" <a role="button" class="btn btn-primary"
href="#call_for_price"
data-bs-toggle="modal" data-bs-toggle="modal"
id="button_call_for_price"> id="button_call_for_price">
Call for Price Call for Price
@ -95,7 +120,8 @@
</template> </template>
<!-- Template for 'Call for Price' modal --> <!-- Template for 'Call for Price' modal -->
<template id="shop_product_hide_price" inherit_id="website_sale.product"> <template id="shop_product_hide_price" inherit_id="website_sale.product">
<xpath expr="//div[@id='o_product_terms_and_share']" position="before"> <xpath expr="//div[@id='o_product_terms_and_share']"
position="before">
<div id="call_for_price" class="modal fade"> <div id="call_for_price" class="modal fade">
<div class="modal-dialog modal-content" style="height:auto"> <div class="modal-dialog modal-content" style="height:auto">
<div class="page"> <div class="page">
@ -103,25 +129,34 @@
<center>Call For Price</center> <center>Call For Price</center>
</h3> </h3>
</div> </div>
<input type="hidden" name="product_id" id="product_id" t-att-value="product.id"/> <input type="hidden" name="product_id" id="product_id"
t-att-value="product.id"/>
<hr/> <hr/>
<center> <center>
<table style="width:500px"> <table style="width:500px">
<tr style="height:60px"> <tr style="height:60px">
<td style="width:100px"> <td style="width:100px">
<label for="first_name" class="control-label">First Name:*</label> <label for="first_name"
class="control-label">First
Name:*
</label>
</td> </td>
<td> <td>
<input type="text" class="form-control" name="first_name" <input type="text" class="form-control"
id="first_name" required="required"/> name="first_name"
id="first_name"
required="required"/>
</td> </td>
</tr> </tr>
<tr style="height:60px"> <tr style="height:60px">
<td> <td>
<label for="last_name" class="control-label">Last Name:</label> <label for="last_name"
class="control-label">Last Name:
</label>
</td> </td>
<td> <td>
<input type="text" class="form-control" name="last_name" <input type="text" class="form-control"
name="last_name"
id="last_name"/> id="last_name"/>
</td> </td>
</tr> </tr>
@ -130,7 +165,8 @@
<label for="email">Email</label> <label for="email">Email</label>
</td> </td>
<td> <td>
<input type="text" class="form-control" name="email" <input type="text" class="form-control"
name="email"
id="email" required="required"/> id="email" required="required"/>
</td> </td>
</tr> </tr>
@ -139,7 +175,8 @@
<label for="phone">Contact No.*</label> <label for="phone">Contact No.*</label>
</td> </td>
<td> <td>
<input type="text" class="form-control" id="phone" name="phone"/> <input type="text" class="form-control"
id="phone" name="phone"/>
</td> </td>
</tr> </tr>
<tr style="height:60px"> <tr style="height:60px">
@ -147,7 +184,9 @@
<label>Quantity</label> <label>Quantity</label>
</td> </td>
<td> <td>
<input type="number" class="form-control" name="quantity" id="quantity"/> <input type="number"
class="form-control"
name="quantity" id="quantity"/>
</td> </td>
</tr> </tr>
<tr style="height:60px"> <tr style="height:60px">
@ -155,13 +194,20 @@
<label>Message</label> <label>Message</label>
</td> </td>
<td> <td>
<input type="text" class="form-control" name="message" id="message"/> <input type="text" class="form-control"
name="message" id="message"/>
</td> </td>
</tr> </tr>
</table> </table>
<hr/> <hr/>
<button id="send_btn" type="button" data-bs-dismiss="modal" class="btn btn-primary">Send</button> <button id="send_btn" type="button"
<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal" id="call_modal_close"> data-bs-dismiss="modal"
class="btn btn-primary">Send
</button>
<button type="button"
class="btn btn-outline-secondary"
data-bs-dismiss="modal"
id="call_modal_close">
Close Close
</button> </button>
</center> </center>

12
call_for_price_website/views/wishlist_hide_price_template.xml
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<odoo> <odoo>
<!-- This template used to hide price from wishlist page--> <!-- This template used to hide price from wishlist page-->
<template id="wishlist_hide_price" inherit_id="website_sale_wishlist.product_wishlist"> <template id="wishlist_hide_price"
inherit_id="website_sale_wishlist.product_wishlist">
<xpath expr="//td[hasclass('o_wish_price')]" position="replace"> <xpath expr="//td[hasclass('o_wish_price')]" position="replace">
<t t-if="wish.product_id.price_call"></t> <t t-if="wish.product_id.price_call"></t>
<t t-else=""> <t t-else="">
@ -22,11 +23,14 @@
<t t-if="wish.product_id.price_call"></t> <t t-if="wish.product_id.price_call"></t>
<t t-else=""> <t t-else="">
<td class='text-center td-wish-btn align-middle'> <td class='text-center td-wish-btn align-middle'>
<input name="product_id" t-att-value="wish.product_id.id" type="hidden"/> <input name="product_id"
<a t-if="combination_info['prevent_zero_price_sale']" t-att-href="website.contact_us_button_url" t-att-value="wish.product_id.id" type="hidden"/>
<a t-if="combination_info['prevent_zero_price_sale']"
t-att-href="website.contact_us_button_url"
class="btn btn-primary btn_cta">Contact Us class="btn btn-primary btn_cta">Contact Us
</a> </a>
<button id="add_to_cart_button" t-else="" type="button" role="button" <button id="add_to_cart_button" t-else="" type="button"
role="button"
class="btn btn-secondary btn-block o_wish_add mb4"> class="btn btn-secondary btn-block o_wish_add mb4">
Add Add
<span class='d-none d-md-inline'>to Cart</span> <span class='d-none d-md-inline'>to Cart</span>

Write Preview
Loading…
Cancel
Save