Added ticket sms options

front/core/components/popover/index.js

@@ -85,7 +85,10 @@ export default class Popover extends Popup {
         let maxWith = maxRight - margin;
         let maxHeight = maxBottom - margin - arrowHeight;
 
-        let width = clamp(popoverRect.width, parentRect.width, maxWith);
+        const scrollbarWidth = (popoverRect.width);
+        const innerEl = this.windowEl.querySelector('.content > *');
+        console.log(innerEl);
+        let width = clamp(popoverRect.width, parentRect.width, maxWith) + 20;
         let height = popoverRect.height;
 
         let left = parentRect.left + parentRect.width / 2 - width / 2;

modules/ticket/front/descriptor/index.js

@@ -16,7 +16,8 @@ class Controller extends Component {
             {name: 'Send Delivery Note', callback: this.confirmDeliveryNote},
             {name: 'Delete ticket', callback: this.showDeleteTicketDialog},
             {name: 'Change shipped hour', callback: this.showChangeShipped},
-            {name: 'Send SMS', callback: this.showSMSDialog},
+            {name: 'SMS: Pending payment', callback: this.sendPaymentSms},
+            {name: 'SMS: Minimum import', callback: this.sendImportSms},
             {
                 name: 'Add stowaway',
                 callback: this.showAddStowaway,
@@ -240,17 +241,30 @@ class Controller extends Component {
         );
     }
 
+    sendImportSms() {
+        const params = {
+            ticketId: this.ticket.id,
+            created: this.ticket.created
+        };
+        const message = this.$params.message || this.$translate.instant('Minimum is needed', params);
+        this.newSMS = {message};
+        this.showSMSDialog();
+    }
+
+    sendPaymentSms() {
+        const message = this.$params.message || this.$translate.instant('Make a payment');
+        this.newSMS = {message};
+        this.showSMSDialog();
+    }
+
     showSMSDialog() {
         const address = this.ticket.address;
         const client = this.ticket.client;
         const phone = this.$params.phone || address.mobile || address.phone ||
             client.mobile || client.phone;
-        const message = this.$params.message || this.$translate.instant('SMSPayment');
+
-        this.newSMS = {
+        this.newSMS.destinationFk = this.ticket.clientFk;
-            destinationFk: this.ticket.clientFk,
+        this.newSMS.destination = phone;
-            destination: phone,
-            message: message
-        };
         this.$.sms.open();
     }
 

modules/ticket/front/descriptor/locale/en.yml

@@ -1,3 +1,2 @@
-SMSPayment: >-
+Make a payment: "Verdnatura communicates:\rYour order is pending of payment.\rPlease, enter the web page and make the payment with card.\rThank you."
-    Verdnatura communicates: Your order is pending of payment. 
+Minimum is needed: "Verdnatura communicates:\rA minimum import of 50€ (Without BAT) is needed for your order {{ticketId}} from date {{created | date: 'dd/MM/yyyy'}} to receive it with no extra fees."
-    Please, enter the web page and make the payment with card. Thank you.

modules/ticket/front/descriptor/locale/es.yml

@@ -13,7 +13,8 @@ Send Delivery Note: Enviar albarán
 Show pallet report: Ver hoja de pallet
 Change shipped hour: Cambiar hora de envío
 Shipped hour: Hora de envío
-SMSPayment: "Verdnatura le comunica:\rSu pedido está pendiente de pago.\rPor favor, entre en la página web y efectue el pago con tarjeta.\rMuchas gracias."
+Make a payment: "Verdnatura le comunica:\rSu pedido está pendiente de pago.\rPor favor, entre en la página web y efectue el pago con tarjeta.\rMuchas gracias."
+Minimum is needed: "Verdnatura le recuerda:\rEs necesario llegar a un importe mínimo de 50€ (Sin IVA) en su pedido {{ticketId}} del día {{created | date: 'dd/MM/yyyy'}} para recibirlo sin portes adicionales."
 Ticket invoiced: Ticket facturado
 Make invoice: Crear factura
 Regenerate invoice: Regenerar factura
@@ -26,3 +27,5 @@ Shipped hour updated: Hora de envio modificada
 Deleted ticket: Ticket eliminado 
 Recalculate components: Recalcular componentes
 Are you sure you want to recalculate the components?: ¿Seguro que quieres recalcular los componentes?
+SMS: Minimum import: 'SMS: Importe minimo'
+SMS: Pending payment: 'SMS: Pago pendiente'

modules/ticket/front/index/locale/es.yml

@@ -3,3 +3,4 @@ Go to lines: Ir a lineas
 Not available: No disponible
 Payment on account...: Pago a cuenta...
 Closure: Cierre
+You cannot make a payment on account from multiple clients: No puedes realizar un pago a cuenta de clientes diferentes