summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Mathot <rim@odoo.com>2016-02-02 09:37:50 +0100
committerRichard Mathot <rim@odoo.com>2016-02-02 14:01:35 +0100
commit36fbbc46e1b0c376aa09cd24ec4fd78e80a68c11 (patch)
tree7f13180e8a316902ebc79c79202ff908ea7eb85c
parent055367a863437fa3207c2f5340ac6f3a7c6dcc24 (diff)
[ADD] delivery: environment field
This field is used in all delivery carriers to determine if they call the test or the production API.
-rw-r--r--addons/delivery/models/delivery_carrier.py5
-rw-r--r--addons/delivery/views/delivery_view.xml8
-rw-r--r--addons/web/static/src/js/views/form_widgets.js6
-rw-r--r--addons/website_sale_delivery/views/website_sale_delivery_view.xml15
4 files changed, 25 insertions, 9 deletions
diff --git a/addons/delivery/models/delivery_carrier.py b/addons/delivery/models/delivery_carrier.py
index dbf93a92853..8a7f8fee787 100644
--- a/addons/delivery/models/delivery_carrier.py
+++ b/addons/delivery/models/delivery_carrier.py
@@ -51,6 +51,11 @@ class DeliveryCarrier(models.Model):
price_rule_ids = fields.One2many('delivery.price.rule', 'carrier_id', 'Pricing Rules', copy=True)
fixed_price = fields.Float(compute='_compute_fixed_price', inverse='_set_product_fixed_price', store=True, string='Fixed Price',help="Keep empty if the pricing depends on the advanced pricing per destination")
shipping_enabled = fields.Boolean(string="Shipping enabled", default=True, help="Uncheck this box to disable package shipping while validating Delivery Orders")
+ prod_environment = fields.Boolean("Environment", help="Set to True if your credentials are certified for production.")
+
+ @api.one
+ def toggle_prod_environment(self):
+ self.prod_environment = not self.prod_environment
@api.multi
def name_get(self):
diff --git a/addons/delivery/views/delivery_view.xml b/addons/delivery/views/delivery_view.xml
index 5ba8dde9665..22aac5c82fb 100644
--- a/addons/delivery/views/delivery_view.xml
+++ b/addons/delivery/views/delivery_view.xml
@@ -23,6 +23,14 @@
<field name="arch" type="xml">
<form string="Carrier">
<sheet>
+ <div class="oe_button_box" name="button_box">
+ <button name="toggle_active" type="object" class="oe_stat_button" icon="fa-archive">
+ <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
+ </button>
+ <button name="toggle_prod_environment" type="object" class="oe_stat_button" icon="fa-check-square" attrs="{'invisible': ['|', ('delivery_type', '=', 'fixed'), ('delivery_type', '=', 'base_on_rule')]}">
+ <field name="prod_environment" widget="boolean_button" options='{"terminology": "prod_environment"}'/>
+ </button>
+ </div>
<div class="oe_title" name="title">
<label for="name" string="Name" class="oe_edit_only"/>
<h1>
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js
index 0f89396eed2..ab0aa409a7a 100644
--- a/addons/web/static/src/js/views/form_widgets.js
+++ b/addons/web/static/src/js/views/form_widgets.js
@@ -665,6 +665,12 @@ var FieldBooleanButton = common.AbstractField.extend({
this.string_false = _t("Archived");
this.hover_false = _t("Unarchive");
break;
+ case "prod_environment":
+ this.string_true = _t("Production Environment");
+ this.hover_true = _t("Switch to test environment");
+ this.string_false = _t("Test Environment");
+ this.hover_false = _t("Switch to production environment");
+ break;
default:
this.string_true = _t("On");
this.hover_true = _t("Switch Off");
diff --git a/addons/website_sale_delivery/views/website_sale_delivery_view.xml b/addons/website_sale_delivery/views/website_sale_delivery_view.xml
index 12a48b96f85..c547fa99973 100644
--- a/addons/website_sale_delivery/views/website_sale_delivery_view.xml
+++ b/addons/website_sale_delivery/views/website_sale_delivery_view.xml
@@ -1,20 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <record model="ir.ui.view" id="view_delivery_carrier_form">
+ <record model="ir.ui.view" id="view_delivery_carrier_form_website_delivery">
<field name="name">delivery.carrier.website.form</field>
<field name="model">delivery.carrier</field>
<field name="inherit_id" ref="delivery.view_delivery_carrier_form"/>
<field name="arch" type="xml">
- <div name="title" position="before">
- <div class="oe_button_box" name="button_box">
- <button class="oe_stat_button" name="website_publish_button"
- type="object" icon="fa-globe">
- <field name="website_published" widget="website_button"/>
- </button>
- </div>
+ <div name="button_box" position="inside">
+ <button class="oe_stat_button" name="website_publish_button" type="object" icon="fa-globe">
+ <field name="website_published" widget="website_button"/>
+ </button>
</div>
<div name="title" position="after">
- <group>
+ <group name="website">
<field name="website_description" string="Description" placeholder="Description displayed on the eCommerce and on the Online Quotations."/>
</group>
</div>