pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] website,website_sale: Apply some fine tunings for the new website settings form

Browse Source
This commit is contained in:
Yannick Tivisse
2017-01-04 12:03:44 +01:00
parent aecf89c0e0
commit 44e1f9ab96
3 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/views/res_config_views.xml
+11
View File
@@ -129,6 +129,17 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box">
<div class="o_setting_left_pane">
<field name="module_website_version"/>
</div>
<div class="o_setting_right_pane">
<label for="module_website_version"/>
<div class="text-muted">
Create several versions of your website pages
</div>
</div>
</div>
</div>
<h2>Social Media</h2>
addons/website_sale/models/res_config.py
+4 -1
View File
@@ -28,6 +28,7 @@ class WebsiteConfigSettings(models.TransientModel):
module_delivery_usps = fields.Boolean("USPS integration")
module_sale_ebay = fields.Boolean("eBay connector")
module_sale_coupon = fields.Boolean("Manage coupons and promotional offers")
group_website_multiimage = fields.Boolean(string='Multi-Images', implied_group='website_sale.group_website_multi_image')
group_discount_per_so_line = fields.Boolean(string="Discounted Prices", implied_group='sale.group_discount_per_so_line')
@@ -54,7 +55,9 @@ class WebsiteConfigSettings(models.TransientModel):
group_product_pricelist = fields.Boolean("Show pricelists On Products",
implied_group='product.group_product_pricelist')
order_mail_template = fields.Many2one('mail.template', string='Order Confirmation Email', default=_default_order_mail_template, help="Email sent to customer at the end of the checkout process")
order_mail_template = fields.Many2one('mail.template', string='Order Confirmation Email',
default=_default_order_mail_template, domain="[('model', '=', 'sale.order')]",
help="Email sent to customer at the end of the checkout process")
group_show_price_subtotal = fields.Boolean("Show subtotal", implied_group='sale.group_show_price_subtotal')
group_show_price_total = fields.Boolean("Show total", implied_group='sale.group_show_price_total')
addons/website_sale/views/res_config_view.xml
+28 -12
View File
@@ -25,6 +25,22 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" title="Boost your sales with two kinds of discount programs: promotions and coupon codes. Specific conditions can be set (products, customers, minimum purchase amount, period). Rewards can be discounts (% or amount) or free products.">
<div class="o_setting_left_pane">
<field name="module_sale_coupon" widget="upgrade_boolean"/>
</div>
<div class="o_setting_right_pane">
<label string="Discount Programs"/>
<div class="text-muted">
Manage promotion &amp; coupon programs
</div>
<div class="content-group">
<div class="text-warning mt16" id="sale_coupon" attrs="{'invisible': [('module_sale_coupon','=',False)]}">
Save this page and come back here to set up the feature.
</div>
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" id="pricelists_setting" title="There are two ways to manage pricelists:
Multiple prices per product: must be set in the Sales tab of the product detail form.
Price computed from formulas: must be set in the pricelist form.">
@@ -134,6 +150,17 @@
<h2>Checkout Process</h2>
<div class="row mt16 o_settings_container" id="sale_checkout_settings">
<div class="col-xs-12 col-md-6 o_setting_box" id="shipping_address_setting">
<div class="o_setting_left_pane">
<field name="group_delivery_invoice_address"/>
</div>
<div class="o_setting_right_pane">
<label for="group_delivery_invoice_address"/>
<div class="text-muted">
Let the customer enter a shipping address
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" id="checkout_mail_setting">
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
@@ -149,18 +176,7 @@
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" id="shipping_address_setting">
<div class="o_setting_left_pane">
<field name="group_delivery_invoice_address"/>
</div>
<div class="o_setting_right_pane">
<label for="group_delivery_invoice_address"/>
<div class="text-muted">
Let the customer enter a shipping address
</div>
</div>
</div>
<div class="col-xs-12 col-md-6 o_setting_box" id="checkout_assignation_setting" groups="base.group_no_one">
<div class="col-xs-12 col-md-6 o_setting_box" id="checkout_assignation_setting">
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<label string="Assignation"/>