From 91637fd0cf2faead7cdb6848ef1fec107f98bea5 Mon Sep 17 00:00:00 2001
From: Alexis de Lattre <alexis.delattre@akretion.com>
Date: Fri, 15 Mar 2019 18:47:22 +0100
Subject: [PATCH] Improve style of Dial button

Improve messages in notification pop-up
Fix short disconnect upon click2dial
Add active button for asterisk.server form view
Fix add call in CRM wizard
---
 .../static/src/js/asterisk_click2dial.js            | 13 ++++++-------
 asterisk_click2dial/views/asterisk_server.xml       | 10 +++++++++-
 base_phone/static/src/js/phone_widget.js            |  9 ++++-----
 crm_phone/wizard/create_crm_phonecall.py            |  5 +----
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/asterisk_click2dial/static/src/js/asterisk_click2dial.js b/asterisk_click2dial/static/src/js/asterisk_click2dial.js
index 1d41dd4..1f6c12e 100644
--- a/asterisk_click2dial/static/src/js/asterisk_click2dial.js
+++ b/asterisk_click2dial/static/src/js/asterisk_click2dial.js
@@ -7,7 +7,6 @@ odoo.define('asterisk_click2dial.systray.OpenCaller', function (require) {
 
 var core = require('web.core');
 var SystrayMenu = require('web.SystrayMenu');
-var web_client = require('web.web_client');
 var Widget = require('web.Widget');
 
 var _t = core._t;
@@ -42,8 +41,8 @@ var OpenCallerMenu = Widget.extend({
         // console.log('RESULT RPC isNaN r='+isNaN(r));
         if (r === false) {
              self.do_warn(
-                _t('Failure'),
-                _t('Problem in the connection to Asterisk'),
+                _t('IPBX error'),
+                _t('Calling party number not retreived from IPBX or IPBX unreachable by Odoo'),
                 false);
         }
         else if (typeof r == 'string' && isNaN(r)) {
@@ -62,13 +61,13 @@ var OpenCallerMenu = Widget.extend({
                 target: 'new',
                 context: {'default_calling_number': r},
              };
-            web_client.action_manager.do_action(action);
+            self.do_action(action);
 
             }
         else if (typeof r == 'object' && r.length == 3) {
             self.do_notify(
-                _t('Success'),
-                _.str.sprintf(_t('Moving to %s ID %d'), r[0], r[1]),
+                _.str.sprintf(_t("On the phone with '%s'"), r[2]),
+                _.str.sprintf(_t("Moving to form view of '%s' (%s ID %d)"), r[2], r[0], r[1]),
                 false);
             var action = {
                 type: 'ir.actions.act_window',
@@ -86,7 +85,7 @@ var OpenCallerMenu = Widget.extend({
                 target: 'current',
                 context: {},
             };
-            web_client.action_manager.do_action(action);
+            self.do_action(action);
         }
     });
    },
diff --git a/asterisk_click2dial/views/asterisk_server.xml b/asterisk_click2dial/views/asterisk_server.xml
index 246d838..d7305bc 100644
--- a/asterisk_click2dial/views/asterisk_server.xml
+++ b/asterisk_click2dial/views/asterisk_server.xml
@@ -14,6 +14,8 @@
         <search string="Asterisk Server Search">
             <field name="name"
                 filter_domain="['|', ('name', 'ilike', self), ('ip_address', 'ilike', self)]"/>
+            <separator/>
+            <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
         </search>
     </field>
 </record>
@@ -24,6 +26,13 @@
     <field name="arch" type="xml">
         <form string="Asterisk Servers">
             <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>
+                </div>
                 <div class="oe_title">
                     <label for="name" string="Server Name" class="oe_edit_only"/>
                     <h1>
@@ -33,7 +42,6 @@
                 <group name="main">
                     <field name="company_id"
                         groups="base.group_multi_company"/>
-                    <field name="active" />
                 </group>
                 <group name="ami" string="Asterisk Manager Interface">
                     <field name="ip_address" />
diff --git a/base_phone/static/src/js/phone_widget.js b/base_phone/static/src/js/phone_widget.js
index ad67d6a..6876033 100644
--- a/base_phone/static/src/js/phone_widget.js
+++ b/base_phone/static/src/js/phone_widget.js
@@ -34,7 +34,7 @@ odoo.define('base_phone.updatedphone_widget', function (require) {
             var self = this;
 
             // create our link
-            var dial = $('<a href="#" class="dial">📞 Dial</a>');
+            var dial = $('<a href="#" class="dial"><div class="label label-primary">☎ Dial</div></a>');
 
             // add a parent element
             // it's not possible to append to $el directly
@@ -53,7 +53,7 @@ odoo.define('base_phone.updatedphone_widget', function (require) {
         click2dial: function(phone_num) {
             var self = this;
             this.do_notify(
-                _t('Click2dial started'),
+                _.str.sprintf(_t('Click2dial to %s'), phone_num),
                 _t('Unhook your ringing phone'),
                 false);
             var params = {
@@ -65,13 +65,12 @@ odoo.define('base_phone.updatedphone_widget', function (require) {
                 params: params,
             }).then(function(r) {
                 console.log('successfull', r);
-                // TODO: check why it never goes in there
                 if (r === false) {
                     self.do_warn("Click2dial failed");
                 } else if (typeof r === 'object') {
                     self.do_notify(
                             _t('Click2dial successfull'),
-                            _t('Number dialed:') + ' ' + r.dialed_number,
+                            _.str.sprintf(_t('Number dialed: %s'), r.dialed_number),
                             false);
                     if (r.action_model) {
                         var action = {
@@ -83,7 +82,7 @@ odoo.define('base_phone.updatedphone_widget', function (require) {
                             target: 'new',
                             context: params,
                         };
-                        return this.do_action(action);
+                        return self.do_action(action);
                     }
                 }
             }, function (r) {
diff --git a/crm_phone/wizard/create_crm_phonecall.py b/crm_phone/wizard/create_crm_phonecall.py
index 12a8b2b..904ea2e 100644
--- a/crm_phone/wizard/create_crm_phonecall.py
+++ b/crm_phone/wizard/create_crm_phonecall.py
@@ -30,15 +30,12 @@ class WizardCreateCrmPhonecall(models.TransientModel):
             'default_direction': direction,
             'default_team_id': teams and teams[0].id or False,
         })
-        domain = False
         if self.env.context.get('click2dial_model') == 'res.partner':
             partner_id = self.env.context.get('click2dial_id')
             action_ctx['default_partner_id'] = partner_id
-            domain = [('partner_id', 'child_of', partner_id)]
         elif self.env.context.get('click2dial_model') == 'crm.lead':
             lead_id = self.env.context.get('click2dial_id')
             action_ctx['default_opportunity_id'] = lead_id
-            domain = [('opportunity_id', '=', lead_id)]
         parsed_num = phonenumbers.parse(self.env.context.get('phone_number'))
         number_type = phonenumbers.number_type(parsed_num)
         if number_type == 1:
@@ -50,8 +47,8 @@ class WizardCreateCrmPhonecall(models.TransientModel):
         action = self.env['ir.actions.act_window'].for_xml_id(
             'crm_phone', 'crm_phonecall_action')
         action.update({
-            'domain': domain,
             'view_mode': 'form,tree,calendar',
+            'views': False,
             'context': action_ctx,
             })
         return action