Anonymous | Login

Project:

News | My View | View Issues | Roadmap | Summary

View Issue Details[ Jump to Notes ]

[ Issue History ] [ Print ]

ID

0026881

Type

Category

Severity

Reproducibility

Date Submitted

Last Update

feature request

[Retail Modules] Web POS

trivial

have not tried

2014-06-17 09:55

2015-01-08 12:45

Reporter

rafademiguel

View Status

public

Assigned To

ebecerra

Priority

normal

Resolution

fixed

Fixed in Version

RR15Q1

Status

closed

Fix in branch

Fixed in SCM revision

Projection

none

ETA

none

Target Version

OS

Any

Database

Any

Java version

OS Version

Database version

Ant version

Product Version

SCM revision

Review Assigned To

marvintm

Regression level

Regression date

Regression introduced in release

Regression introduced by commit

Triggers an Emergency Pack

No

Summary

0026881: Allow to define a limit amount by payment method in WebPOS.

Description

- Define a limit amount per payment method
- Every payment cannot exceed this limit. In case exceeds this limit:

-- The system will show a red message in the payment area in the same way happens when there is no change
--The system will not create the payment

Steps To Reproduce

N/A

Tags

No tags attached.

issue_26881_org.openbravo.retail.posterminal.diff [^] (18,826 bytes) 2014-09-03 11:27 [Show Content] [Hide Content]

diff --git a/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml b/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml
--- a/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml
+++ b/src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml
@@ -137,6 +137,10 @@
         <default><![CDATA[N]]></default>
         <onCreateDefault/>
       </column>
+      <column name="MAX_LIMIT_AMOUNT" primaryKey="false" required="false" type="DECIMAL" autoIncrement="false">
+        <default/>
+        <onCreateDefault/>
+      </column>        
       <column name="SHOWKEYPAD" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
         <default><![CDATA[Y]]></default>
         <onCreateDefault><![CDATA['Y']]></onCreateDefault>
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -2305,6 +2305,39 @@
 <!--4C31D9531AF848058BF9E66963BCD3F5-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
 <!--4C31D9531AF848058BF9E66963BCD3F5--></AD_COLUMN>
 
+<!--4C922A5B64F44559A688E91A30C4B841--><AD_COLUMN>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <AD_COLUMN_ID><![CDATA[4C922A5B64F44559A688E91A30C4B841]]></AD_COLUMN_ID>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <NAME><![CDATA[Max. Limit Amount]]></NAME>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <COLUMNNAME><![CDATA[MAX_Limit_Amount]]></COLUMNNAME>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <AD_TABLE_ID><![CDATA[B096FDF43917472D8FDE9693E9CCFFD4]]></AD_TABLE_ID>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <AD_REFERENCE_ID><![CDATA[11]]></AD_REFERENCE_ID>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <FIELDLENGTH><![CDATA[2]]></FIELDLENGTH>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISKEY><![CDATA[N]]></ISKEY>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISMANDATORY><![CDATA[N]]></ISMANDATORY>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <SEQNO><![CDATA[425]]></SEQNO>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <AD_ELEMENT_ID><![CDATA[A6C06729F07F4E969424B826EA695F76]]></AD_ELEMENT_ID>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <POSITION><![CDATA[34]]></POSITION>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--4C922A5B64F44559A688E91A30C4B841-->  <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--4C922A5B64F44559A688E91A30C4B841--></AD_COLUMN>
+
 <!--4E8EE289C4C74F5E8214AC506864CCFF--><AD_COLUMN>
 <!--4E8EE289C4C74F5E8214AC506864CCFF-->  <AD_COLUMN_ID><![CDATA[4E8EE289C4C74F5E8214AC506864CCFF]]></AD_COLUMN_ID>
 <!--4E8EE289C4C74F5E8214AC506864CCFF-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml
@@ -851,6 +851,18 @@
 <!--9E95A0C00A6C4BDF8BC7D88C0BD4292A-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
 <!--9E95A0C00A6C4BDF8BC7D88C0BD4292A--></AD_ELEMENT>
 
+<!--A6C06729F07F4E969424B826EA695F76--><AD_ELEMENT>
+<!--A6C06729F07F4E969424B826EA695F76-->  <AD_ELEMENT_ID><![CDATA[A6C06729F07F4E969424B826EA695F76]]></AD_ELEMENT_ID>
+<!--A6C06729F07F4E969424B826EA695F76-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A6C06729F07F4E969424B826EA695F76-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A6C06729F07F4E969424B826EA695F76-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A6C06729F07F4E969424B826EA695F76-->  <COLUMNNAME><![CDATA[MAX_Limit_Amount]]></COLUMNNAME>
+<!--A6C06729F07F4E969424B826EA695F76-->  <NAME><![CDATA[Max. Limit Amount]]></NAME>
+<!--A6C06729F07F4E969424B826EA695F76-->  <PRINTNAME><![CDATA[Max. Limit Amount]]></PRINTNAME>
+<!--A6C06729F07F4E969424B826EA695F76-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--A6C06729F07F4E969424B826EA695F76-->  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--A6C06729F07F4E969424B826EA695F76--></AD_ELEMENT>
+
 <!--A7B5555743F2408B83F6F83B228871BC--><AD_ELEMENT>
 <!--A7B5555743F2408B83F6F83B228871BC-->  <AD_ELEMENT_ID><![CDATA[A7B5555743F2408B83F6F83B228871BC]]></AD_ELEMENT_ID>
 <!--A7B5555743F2408B83F6F83B228871BC-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml
+++ b/src-db/database/sourcedata/AD_FIELD.xml
@@ -3484,6 +3484,33 @@
 <!--B6F060C4E5584D59BAA52B4ACA409427-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
 <!--B6F060C4E5584D59BAA52B4ACA409427--></AD_FIELD>
 
+<!--B90773AC17054606AFF816101C688686--><AD_FIELD>
+<!--B90773AC17054606AFF816101C688686-->  <AD_FIELD_ID><![CDATA[B90773AC17054606AFF816101C688686]]></AD_FIELD_ID>
+<!--B90773AC17054606AFF816101C688686-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--B90773AC17054606AFF816101C688686-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--B90773AC17054606AFF816101C688686-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--B90773AC17054606AFF816101C688686-->  <NAME><![CDATA[Max. Limit Amount]]></NAME>
+<!--B90773AC17054606AFF816101C688686-->  <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--B90773AC17054606AFF816101C688686-->  <AD_TAB_ID><![CDATA[4D9F5E9CC0014A96861CEFB64BBF013B]]></AD_TAB_ID>
+<!--B90773AC17054606AFF816101C688686-->  <AD_COLUMN_ID><![CDATA[4C922A5B64F44559A688E91A30C4B841]]></AD_COLUMN_ID>
+<!--B90773AC17054606AFF816101C688686-->  <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--B90773AC17054606AFF816101C688686-->  <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--B90773AC17054606AFF816101C688686-->  <DISPLAYLENGTH><![CDATA[2]]></DISPLAYLENGTH>
+<!--B90773AC17054606AFF816101C688686-->  <ISREADONLY><![CDATA[N]]></ISREADONLY>
+<!--B90773AC17054606AFF816101C688686-->  <SEQNO><![CDATA[98]]></SEQNO>
+<!--B90773AC17054606AFF816101C688686-->  <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--B90773AC17054606AFF816101C688686-->  <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--B90773AC17054606AFF816101C688686-->  <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--B90773AC17054606AFF816101C688686-->  <SHOWINRELATION><![CDATA[Y]]></SHOWINRELATION>
+<!--B90773AC17054606AFF816101C688686-->  <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--B90773AC17054606AFF816101C688686-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--B90773AC17054606AFF816101C688686-->  <GRID_SEQNO><![CDATA[220]]></GRID_SEQNO>
+<!--B90773AC17054606AFF816101C688686-->  <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--B90773AC17054606AFF816101C688686-->  <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--B90773AC17054606AFF816101C688686-->  <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--B90773AC17054606AFF816101C688686-->  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--B90773AC17054606AFF816101C688686--></AD_FIELD>
+
 <!--B9AAD3F1D57246E0B095002B7A3EF761--><AD_FIELD>
 <!--B9AAD3F1D57246E0B095002B7A3EF761-->  <AD_FIELD_ID><![CDATA[B9AAD3F1D57246E0B095002B7A3EF761]]></AD_FIELD_ID>
 <!--B9AAD3F1D57246E0B095002B7A3EF761-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -4623,6 +4623,18 @@
 <!--D723F2DFB0CF43FBBBC51A002EDC476C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--D723F2DFB0CF43FBBBC51A002EDC476C--></AD_MESSAGE>
 
+<!--D7678971A3314BB79A4E6AE6BD7D528D--><AD_MESSAGE>
+<!--D7678971A3314BB79A4E6AE6BD7D528D-->  <AD_MESSAGE_ID><![CDATA[D7678971A3314BB79A4E6AE6BD7D528D]]></AD_MESSAGE_ID>
+<!--D7678971A3314BB79A4E6AE6BD7D528D-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--D7678971A3314BB79A4E6AE6BD7D528D-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--D7678971A3314BB79A4E6AE6BD7D528D-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--D7678971A3314BB79A4E6AE6BD7D528D-->  <VALUE><![CDATA[OBPOS_PaymentMaxLimitAmount]]></VALUE>
+<!--D7678971A3314BB79A4E6AE6BD7D528D-->  <MSGTEXT><![CDATA[The maximum limit (%0 %1) for this payment method has been exceeded. Payment not allowed]]></MSGTEXT>
+<!--D7678971A3314BB79A4E6AE6BD7D528D-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--D7678971A3314BB79A4E6AE6BD7D528D-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--D7678971A3314BB79A4E6AE6BD7D528D-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--D7678971A3314BB79A4E6AE6BD7D528D--></AD_MESSAGE>
+
 <!--D8364927BAAC4279A9967AFDDA8DC239--><AD_MESSAGE>
 <!--D8364927BAAC4279A9967AFDDA8DC239-->  <AD_MESSAGE_ID><![CDATA[D8364927BAAC4279A9967AFDDA8DC239]]></AD_MESSAGE_ID>
 <!--D8364927BAAC4279A9967AFDDA8DC239-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/web/org.openbravo.retail.posterminal/js/components/keypadcoins.js b/web/org.openbravo.retail.posterminal/js/components/keypadcoins.js
--- a/web/org.openbravo.retail.posterminal/js/components/keypadcoins.js
+++ b/web/org.openbravo.retail.posterminal/js/components/keypadcoins.js
@@ -219,18 +219,45 @@
           break;
         }
       }
-      myWindowModel.addPayment(new OB.Model.PaymentLine({
-        kind: me.paymenttype,
-        name: OB.POS.modelterminal.getPaymentName(me.paymenttype),
-        amount: OB.DEC.number(me.amount),
-        rate: p.rate,
-        mulrate: p.mulrate,
-        isocode: p.isocode,
-        isCash: isCash,
-        allowOpenDrawer: allowOpenDrawer,
-        openDrawer: openDrawer,
-        printtwice: printtwice
-      }));
+      // Calculate total amount to pay with selected PaymentMethod  
+      var amountToPay = me.amount;
+      var receiptToPay = myWindowModel.isValidMultiOrderState() ? multiOrders : receipt;
+      if (receiptToPay.get("payments").length > 0) {
+        receiptToPay.get("payments").each(function (item) {
+          if (item.get("kind") === me.paymenttype) {
+            amountToPay += item.get("amount");
+          }
+        });
+      }
+      // Check Max. Limit Amount
+      var paymentMethod = OB.POS.terminal.terminal.paymentnames[this.paymenttype].paymentMethod;
+      if (paymentMethod.maxLimitAmount && amountToPay > paymentMethod.maxLimitAmount) {
+        // Show error and abort payment
+        this.bubble('onMaxLimitAmountError', {
+          show: true,
+          maxLimitAmount: paymentMethod.maxLimitAmount,
+          currency: paymentMethod.currency$_identifier === 'EUR' ? '€' : paymentMethod.currency$_identifier
+        });
+      } else {
+        // Hide error and process payment
+        this.bubble('onMaxLimitAmountError', {
+          show: false,
+          maxLimitAmount: 0,
+          currency: ''
+        });
+        myWindowModel.addPayment(new OB.Model.PaymentLine({
+          kind: me.paymenttype,
+          name: OB.POS.modelterminal.getPaymentName(me.paymenttype),
+          amount: OB.DEC.number(me.amount),
+          rate: p.rate,
+          mulrate: p.mulrate,
+          isocode: p.isocode,
+          isCash: isCash,
+          allowOpenDrawer: allowOpenDrawer,
+          openDrawer: openDrawer,
+          printtwice: printtwice
+        }));
+      }
     }
   }
 });
\ No newline at end of file
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js
@@ -109,18 +109,43 @@
           }
         });
       } else {
-        this.model.addPayment(new OB.Model.PaymentLine({
-          'kind': key,
-          'name': name,
-          'amount': amount,
-          'rate': rate,
-          'mulrate': mulrate,
-          'isocode': isocode,
-          'allowOpenDrawer': paymentMethod.allowopendrawer,
-          'isCash': paymentMethod.iscash,
-          'openDrawer': paymentMethod.openDrawer,
-          'printtwice': paymentMethod.printtwice
-        }));
+        // Calculate total amount to pay with selected PaymentMethod  
+        var amountToPay = amount;
+        if (receiptToPay.get("payments").length > 0) {
+          receiptToPay.get("payments").each(function (item) {
+            if (item.get("kind") === key) {
+              amountToPay += item.get("amount");
+            }
+          });
+        }
+        // Check Max. Limit Amount
+        if (paymentMethod.maxLimitAmount && amountToPay > paymentMethod.maxLimitAmount) {
+          // Show error and abort payment
+          this.bubble('onMaxLimitAmountError', {
+            show: true,
+            maxLimitAmount: paymentMethod.maxLimitAmount,
+            currency: paymentMethod.currency$_identifier === 'EUR' ? '€' : paymentMethod.currency$_identifier
+          });
+        } else {
+          // Hide error and process payment
+          this.bubble('onMaxLimitAmountError', {
+            show: false,
+            maxLimitAmount: 0,
+            currency: ''
+          });
+          this.model.addPayment(new OB.Model.PaymentLine({
+            'kind': key,
+            'name': name,
+            'amount': amount,
+            'rate': rate,
+            'mulrate': mulrate,
+            'isocode': isocode,
+            'allowOpenDrawer': paymentMethod.allowopendrawer,
+            'isCash': paymentMethod.iscash,
+            'openDrawer': paymentMethod.openDrawer,
+            'printtwice': paymentMethod.printtwice
+          }));
+        }
       }
     }
   },
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js
@@ -15,7 +15,8 @@
     receipt: null
   },
   handlers: {
-    onButtonStatusChanged: 'buttonStatusChanged'
+    onButtonStatusChanged: 'buttonStatusChanged',
+    onMaxLimitAmountError: 'maxLimitAmountError'
   },
   getSelectedPayment: function () {
     if (this.receipt && this.receipt.selectedPayment) {
@@ -29,6 +30,14 @@
     if (_.isUndefined(payment)) {
       return true;
     }
+    // Clear limit amount error when click on PaymentMethod button
+    if (OB.POS.terminal.terminal.paymentnames[inEvent.value.status]) {
+      this.bubble('onMaxLimitAmountError', {
+        show: false,
+        maxLimitAmount: 0,
+        currency: ''
+      });
+    }
     isMultiOrders = this.model.isValidMultiOrderState();
     change = this.model.getChange();
     pending = this.model.getPending();
@@ -48,6 +57,28 @@
     }
     this.checkEnoughCashAvailable(paymentstatus, payment);
   },
+  maxLimitAmountError: function (inSender, inEvent) {
+    var maxHeight;
+    if (inEvent.show) {
+      maxHeight = 115;
+      this.$.errorMaxlimitamount.setContent(OB.I18N.getLabel('OBPOS_PaymentMaxLimitAmount', [inEvent.maxLimitAmount, inEvent.currency]));
+    } else {
+      maxHeight = 150;
+      this.$.errorMaxlimitamount.setContent('');
+    }
+    // Resize scroll area to fix parent panel
+    var component = this.model.isValidMultiOrderState() ? this.$.multiPayments : this.$.payments;
+    if (component.$.tempty.getShowing()) {
+    	maxHeight -= component.$.tempty.getBounds().height;
+    }
+    component.$.scrollArea.setStyle("height: " + maxHeight + "px");
+    // Scroll to bottom
+    var height = 0;
+    component.$.tbody.children.forEach(function (line) {
+      height += line.getBounds().height;
+    });
+    component.$.scrollArea.setScrollTop(height - maxHeight);
+  },
   components: [{
     style: 'background-color: #363636; color: white; height: 200px; margin: 5px; padding: 5px; position: relative;',
     components: [{
@@ -143,6 +174,12 @@
         }]
       }]
 
+    }, {
+      classes: 'span12',
+      components: [{
+        name: 'errorMaxlimitamount',
+        style: 'color: red'
+      }]
     }]
   }],
 
@@ -641,7 +678,11 @@
       this.deleting = true;
       this.removeClass('btn-icon-clearPayment');
       this.addClass('btn-icon-loading');
-
+      this.bubble('onMaxLimitAmountError', {
+        show: false,
+        maxLimitAmount: 0,
+        currency: ''
+      });
       this.doRemovePayment({
         payment: this.owner.model,
         removeCallback: function () {
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js b/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js
@@ -64,6 +64,7 @@
     onStatusChanged: 'statusChanged',
     onLayaways: 'layaways',
     onChangeSalesRepresentative: 'changeSalesRepresentative',
+    onMaxLimitAmountError: 'maxLimitAmountError',
     onMultiOrders: 'multiOrders',
     onSelectMultiOrders: 'selectMultiOrders',
     onRemoveMultiOrders: 'removeMultiOrders',
@@ -817,6 +818,10 @@
     });
     return true;
   },
+  maxLimitAmountError: function (inSender, inEvent) {
+    this.waterfallDown('onMaxLimitAmountError', inEvent);
+    return true;
+  },
   selectBrand: function (inSender, inEvent) {
     this.waterfall('onUpdateBrandFilter', {
       value: inEvent

Relationships [ Relation Graph ] [ Dependency Graph ]

causes	defect	0028574	pi	closed	Orekaria	UI: Wrong displacement created after removing scrolled payment details
causes	defect	0029553	RR15Q3	closed	Orekaria	When the payment limit message is printed, we use a specific condition for euro currency

Notes
(0072056) hgbot (developer) 2014-11-27 11:17	Repository: erp/pmods/org.openbravo.retail.posterminal Changeset: a9632d4fa809fee6768ed38735d537206dcde25c Author: Rafa de Miguel <rafael.demiguel <at> openbravo.com> Date: Thu Nov 27 11:16:40 2014 +0100 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/a9632d4fa809fee6768ed38735d537206dcde25c [^] Fixed issue 26881: Limit amount by payment method --- M src-db/database/model/tables/OBPOS_APP_PAYMENT_TYPE.xml M src-db/database/sourcedata/AD_COLUMN.xml M src-db/database/sourcedata/AD_ELEMENT.xml M src-db/database/sourcedata/AD_FIELD.xml M src-db/database/sourcedata/AD_MESSAGE.xml M web/org.openbravo.retail.posterminal/js/components/keypadcoins.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/keyboard-toolbars.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/payment.js M web/org.openbravo.retail.posterminal/js/pointofsale/view/pointofsale.js ---

Issue History
Date Modified	Username	Field	Change
2014-06-17 09:55	rafademiguel	New Issue
2014-06-17 09:55	rafademiguel	Assigned To	=> rafademiguel
2014-06-17 09:55	rafademiguel	Triggers an Emergency Pack	=> No
2014-06-17 18:27	rafademiguel	Assigned To	rafademiguel => ebecerra
2014-09-03 11:27	rafademiguel	File Added: issue_26881_org.openbravo.retail.posterminal.diff
2014-09-09 16:18	rafademiguel	Issue Monitored: rafademiguel
2014-11-27 11:17	hgbot	Checkin
2014-11-27 11:17	hgbot	Note Added: 0072056
2014-11-27 11:17	hgbot	Status	new => resolved
2014-11-27 11:17	hgbot	Resolution	open => fixed
2014-11-27 11:17	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/pmods/org.openbravo.retail.posterminal/rev/a9632d4fa809fee6768ed38735d537206dcde25c [^]
2014-11-28 11:46	marvintm	Review Assigned To	=> marvintm
2014-11-28 11:46	marvintm	Status	resolved => closed
2014-11-28 11:46	marvintm	Fixed in Version	=> RR15Q1
2015-01-08 12:45	mtaal	Summary	It would be nice to define a limit amount by payment method in WebPOS. => Allow to define a limit amount by payment method in WebPOS.
2015-01-21 11:54	mtaal	Relationship added	causes 0028574
2015-04-09 17:11	Orekaria	Relationship added	related to 0029553
2015-04-09 17:19	Orekaria	Relationship replaced	causes 0029553

Copyright © 2000 - 2009 MantisBT Group