Merge pull request #9 from voxter/3.20-production-changes

Added missed changes from production
voxter · Jun 7, 2015 · 64c9ccd · 64c9ccd
2 parents ce4897d + 4b83923
commit 64c9ccd
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/whapps/voip/device/device.js b/whapps/voip/device/device.js
@@ -738,7 +738,7 @@ winkstart.module('voip', 'device', {
                     .append(device_html);
             };
 
-            if(typeof data.data == 'object' && data.data.device_type == 'sip_device') {
+            if(typeof data.data == 'object' && (data.data.device_type == 'sip_device' || data.data.device_type == 'fax')) {
                 if(winkstart.publish('phone.render_fields', $(device_html), data.data.provision || (data.data.provision = {}), render, data.list_models || {})) {
                     render();
                 }

diff --git a/whapps/voip/faxbox/lang/en.js b/whapps/voip/faxbox/lang/en.js
@@ -44,9 +44,9 @@ window.translate['faxbox'] = {
 	inbound_notification_email_data_content: "List of email addresses separated by a space that will receive a notification when a fax is received by the faxbox",
 	outbound_notification_email: "Fax sent receipts",
 	outbound_notification_email_data_content: "List of email addresses separated by a space that will receive a notification when a fax is sent by the faxbox",
-	custom_smtp_address: "Custom SMTP address",
-	custom_smtp_address_placeholder: "mail@domain.com",
-	custom_smtp_address_data_content: "",
+	custom_smtp_email_address: "Custom SMTP address",
+	custom_smtp_email_address_placeholder: "domain.fax.voxter.com",
+	custom_smtp_email_address_data_content: "",
 	smtp_email_address: "SMTP email address",
 	cloud_connector_claim_url: "Link to printer",
 	cloud_connector_installer_url: "Windows driver",

diff --git a/whapps/voip/faxbox/tmpl/edit.html b/whapps/voip/faxbox/tmpl/edit.html
@@ -135,9 +135,9 @@ <h3>${_t('notification_emails')}</h3>
 					</div>
 
 					<div class="clearfix">
-						<label for="custom_smtp_address">${_t('custom_smtp_address')}</label>
+						<label for="custom_smtp_email_address">${_t('custom_smtp_email_address')}</label>
 						<div class="input">
-							<input class="span4" id="custom_smtp_address" name="custom_smtp_address" type="text" placeholder="${_t('custom_smtp_address_placeholder')}" value="${faxbox.custom_smtp_address}" rel="popover" data-content="${_t('custom_smtp_address_data_content')}"/>
+							<input class="span4" id="custom_smtp_email_address" name="custom_smtp_email_address" type="text" placeholder="${_t('custom_smtp_email_address_placeholder')}" value="${faxbox.custom_smtp_email_address}" rel="popover" data-content="${_t('custom_smtp_email_address_data_content')}"/>
 						</div>
 					</div>
 

diff --git a/whapps/voip/featurecode/featurecode.js b/whapps/voip/featurecode/featurecode.js
@@ -517,6 +517,22 @@ winkstart.module('voip', 'featurecode', {
                         return '^\\*'+number+'([0-9]*)$';
                     }
                 },
+                'group_pickup_feature': {
+                    name: _t('featurecode', 'group_pickup_feature'),
+                    icon: 'phone',
+                    category: _t('featurecode', 'miscellaneous_cat'),
+                    module: 'group_pickup_feature',
+                    number_type: 'pattern',
+                    data: {
+                        type: 'extension'
+                    },
+                    enabled: false,
+                    default_number: '2',
+                    number: this.default_number,
+                    build_regex: function(number) {
+                        return '^\\*'+number+'([0-9]*)$';
+                    }
+                },
                 'park_and_retrieve': {
                     name: _t('featurecode', 'park_and_retrieve'),
                     icon: 'phone',
@@ -530,7 +546,7 @@ winkstart.module('voip', 'featurecode', {
                     default_number: '3',
                     number: this.default_number,
                     build_regex: function(number) {
-                        return '^\\*'+number+'([0-9]*)$';
+                        return '^\\*?2?\\*'+number+'([0-9]*)$';
                     }
                 },
                 'valet': {

diff --git a/whapps/voip/featurecode/lang/en.js b/whapps/voip/featurecode/lang/en.js
@@ -20,6 +20,7 @@ window.translate['featurecode'] = {
 	direct_to_voicemail: "Direct to Voicemail",
 	intercom: "Intercom",
 	privacy: "Privacy",
+	group_pickup_feature: "Directed Pickup",
 	park_and_retrieve: "Park and Retrieve",
 	parking_cat: "Parking",
 	valet: "Valet",