erp_invoicing 3.0.0 → 3.0.1

data/public/javascripts/erp_app/organizer/applications/bill_pay/base.js

@@ -1,25 +1,44 @@
-Ext.ns("Compass.ErpApp.Organizer.Applications.BillPay");
-
-Ext.define("Compass.ErpApp.Organizer.Applications.BillPay.Layout",{
+Ext.define("Compass.ErpApp.Organizer.Applications.BillPay.AccountDetailsPanel",{
   extend:"Ext.panel.Panel",
-  alias:'widget.organizer_billpaylayout',
-  accountId:null,
+  alias:'widget.organizer-billpayaccountdetailspanel',
   constructor : function(config) {
-    var southPanel = Ext.create("Ext.panel.Panel",{
-      layout:'fit',
+    var southPanel = {
+      xtype:'tabpanel',
       region:'south',
       height:300,
+      split:true,
       collapsible:true,
-      border:false,
-      items:[config['southComponent']]
-    });
-
-    var centerPanel = Ext.create("Ext.panel.Panel",{
+      items:[{
+        xtype:'shared-invoicesgridpanel',
+        billingAccountNumber:config.billingAccountNumber,
+        billingAccountId:config.billingAccountId,
+        showAddDelete:true
+      },{
+        xtype:'billpay-paymentaccountsgridpanel',
+        billingAccountNumber:config.billingAccountNumber,
+        billingAccountId:config.billingAccountId
+      }]
+    };
+
+    var billingAccount = config.billingAccount;
+    var billing_account_details = new Ext.Template(["<div style=\"padding: 10px;\"> ",
+        "Account Number: "+  billingAccount.get('account_number') +"<br>",
+        "Send Paper Bills: "+  billingAccount.get('send_paper_bills') +"<br>",
+        "Payable Online: "+  billingAccount.get('payable_online') +"<br>",
+        "Calculate Balance: "+  billingAccount.get('calculate_balance') +"<br>",
+        "Payment Due: "+  billingAccount.get('payment_due') +"<br>",
+        "Balance: "+  billingAccount.get('balance') +"<br>",
+        "Balance Date: "+  Ext.Date.format(billingAccount.get('balance_date'), 'm/d/Y') +"<br>",
+        "Due Date: "+  Ext.Date.format(billingAccount.get('due_date'), 'm/d/Y') +"<br>",
+        "</div>"]);   
+
+    var centerPanel = {
+      xtype:'panel',
       layout:'fit',
       region:'center',
       autoScroll:true,
-      items:[config['centerComponent']]
-    })
+      html:billing_account_details
+    };
 
     config = Ext.apply({
       layout:'border',
@@ -33,47 +52,6 @@ Ext.define("Compass.ErpApp.Organizer.Applications.BillPay.Layout",{
 
     }, config);
     this.callParent([config]);
-  },
-
-  /**
-   * set the private member accountId
-   * @param {Integer} accountId
-  */
-  setaccountId : function(accountId){
-    this.accountId = accountId;
-  },
-
-
-  loadAccountDetails : function(accountId){
-    if(accountId == null){
-      Ext.Msg.alert('Error', 'Account must be selected.');
-    }
-    else{
-      this.accountId = accountId;
-      var tabPanel = this.query('tabpanel')[0];
-
-      var transactionsGrid = tabPanel.query('billpay_transactionsgridpanel')[0];
-      transactionsGrid.getStore().load({
-        params:{
-          account_id:this.account_id
-        }
-      });
-
-      var paymentAccountsGrid = tabPanel.query('billpay_paymentaccountsgridpanel')[0];
-      paymentAccountsGrid.getStore().load({
-        params:{
-          account_id:this.account_id
-        }
-      });
-
-      tabPanel.setActiveTab(0);
-    }
-  },
-
-  loadRemoteData:function(){
-    this.orderId = null;
-    var accountsGridPanel = this.query('billpay_accountsgridpanel')[0]
-    accountsGridPanel.getStore().load();
   }
 
 });
@@ -81,7 +59,7 @@ Ext.define("Compass.ErpApp.Organizer.Applications.BillPay.Layout",{
 Compass.ErpApp.Organizer.Applications.BillPay.Base = function(config){
 
   //setup extensions
-  Compass.ErpApp.Organizer.Applications.BillPay.loadExtensions();
+  //Compass.ErpApp.Organizer.Applications.BillPay.loadExtensions();
 
   var treeMenuStore = Ext.create('Compass.ErpApp.Organizer.DefaultMenuTreeStore', {
     url:'/erp_invoicing/erp_app/organizer/bill_pay/base/menu',
@@ -90,6 +68,7 @@ Compass.ErpApp.Organizer.Applications.BillPay.Base = function(config){
   });
 
   var menuTreePanel = {
+    id:'billpaymenu',
     xtype:'defaultmenutree',
     title:'BillPay',
     store:treeMenuStore,
@@ -100,34 +79,67 @@ Compass.ErpApp.Organizer.Applications.BillPay.Base = function(config){
     }
   };
 
-  var southTabPanel = {
+  var tabPanel = {
     xtype:'tabpanel',
+    title:'Bill Pay',
+    itemId:'billpay-application',
+    plugins: Ext.create('Ext.ux.TabCloseMenu', {
+      extraItemsTail: [
+      '-',
+      {
+        text: 'Closable',
+        checked: true,
+        hideOnClick: true,
+        handler: function (item) {
+          currentItem.tab.setClosable(item.checked);
+        }
+      }
+      ],
+      listeners: {
+        aftermenu: function () {
+          currentItem = null;
+        },
+        beforemenu: function (menu, item) {
+          var menuitem = menu.child('*[text="Closable"]');
+          currentItem = item;
+          menuitem.setChecked(item.closable);
+        }
+      }
+    }),
     items:[{
-      xtype:'billpay_transactionsgridpanel'
-    },{
-      xtype:'billpay_paymentaccountsgridpanel'
-    }]
-  };
-
-  var layout = {
-    id:'billpay_layout',
-    xtype:'organizer_billpaylayout',
-    centerComponent:{
-      id:'billpay_accountsGrid',
-      xtype:'billpay_accountsgridpanel',
+      xtype:'shared-billingaccountsgridpanel',
+      title:'Search',
+      closable:false,
+      autoLoad:false,
       listeners:{
-        'itemclick':function(view, record, item, index, e, options){
-          var id = record.get("id");
-          var layout = view.findParentByType('organizer_billpaylayout');
-          layout.loadAccountDetails(id);
+        'itemdblclick':function(view, record, item, index, e, options){
+          var tabPanel = view.ownerCt.up('tabpanel');
+          var billingAccountNumber = record.get("account_number");
+          var billingAccountId = record.get("id");
+          var itemId = 'billingaccount'+billingAccountId;
+          item = tabPanel.query('#'+itemId).first();
+
+          if(Compass.ErpApp.Utility.isBlank(item)){
+            item = Ext.create("widget.organizer-billpayaccountdetailspanel",{
+              title:billingAccountNumber,
+              closable:true,
+              itemId:itemId,
+              billingAccountId:billingAccountId,
+              billingAccountNumber:billingAccountNumber,
+              billingAccount: record
+            });
+            tabPanel.add(item);
+          }
+
+          tabPanel.setActiveTab(item);
+          
         }
       }
-    },
-    southComponent:southTabPanel
+    }]
   };
 
   this.setup = function(){
-    config['organizerLayout'].addApplication(menuTreePanel, [layout]);
+    config['organizerLayout'].addApplication(menuTreePanel, [tabPanel]);
   };
 
 };

data/public/javascripts/erp_app/organizer/applications/bill_pay/extensions.js

@@ -1,98 +1,7 @@
-Compass.ErpApp.Organizer.Applications.BillPay.loadExtensions = function(){
-  //add Bill Pay tab to individuals tab panel
-  var individualsTabPanel = Ext.getCmp('individualsTabPanel');
-  individualsTabPanel.add({
-    title:'Bill Pay',
-    xtype:'billpay_accountsgridpanel',
-    columns: [
-    {
-      header:'Account Number',
-      sortable: true,
-      dataIndex: 'account_number'
-    },
-    {
-      header:'Payment Due',
-      sortable: true,
-      width:150,
-      dataIndex: 'payment_due'
-    },
-    {
-      header:'Next Billing Date',
-      sortable: true,
-      width:150,
-      dataIndex: 'billing_date'
-    },
-    {
-      header:'Next Payment Due',
-      sortable: true,
-      dataIndex: 'due_date'
-    },
-    {
-      menuDisabled:true,
-      resizable:false,
-      xtype:'actioncolumn',
-      header:'Make Payment',
-      align:'center',
-      width:100,
-      items:[{
-        icon:'/images/icons/creditcards/creditcards_16x16.png',
-        tooltip:'Make Payment',
-        handler :function(grid, rowIndex, colIndex){
-          var rec = grid.getStore().getAt(rowIndex);
-          var makePaymentWindow = Ext.create("Compass.ErpApp.Organizer.Applications.BillPay.MakePaymentWindow",{
-            amount:rec.get('payment_due'),
-            accountId:rec.get('id')
-          });
-          makePaymentWindow.show();
-        }
-      }]
-    },
-    {
-      menuDisabled:true,
-      resizable:false,
-      xtype:'actioncolumn',
-      header:'Account Details',
-      align:'center',
-      width:100,
-      items:[{
-        icon:'/images/icons/about/about_16x16.png',
-        tooltip:'View Account Details',
-        handler :function(grid, rowIndex, colIndex){
-          var rec = grid.getStore().getAt(rowIndex);
-          var accountId = rec.get('id');
-
-          var billPayLayout = Ext.getCmp('billpay_layout');
-          billPayLayout.loadAccountDetails(accountId);
-          var accountsGridPanel = billPayLayout.query('billpay_accountsgridpanel')[0];
-          accountsGridPanel.getStore().load({
-            params:{
-              account_id:accountId,
-              start:1,
-              limit:1
-            }
-          })
-
-          Compass.ErpApp.Organizer.Layout.setActiveCenterItem('billpay_layout', false);
-        }
-      }]
-    },
-    {
-      menuDisabled:true,
-      resizable:false,
-      xtype:'actioncolumn',
-      header:'Delete',
-      align:'center',
-      width:60,
-      items:[{
-        icon:'/images/icons/delete/delete_16x16.png',
-        tooltip:'Delete',
-        handler :function(grid, rowIndex, colIndex){
-          var rec = grid.getStore().getAt(rowIndex);
-          grid.deleteOrder(rec);
-        }
-      }]
-    }
-    ],
+Ext.define("Compass.ErpApp.Organizer.Applications.BillPay.PartyAccountsTab",{
+  extend:"Compass.ErpApp.Shared.BillingAccountsGridPanel",
+  alias:'widget.billpay',
+    title:'Accounts',
     listeners:{
       activate:function(grid){
         var contactsLayout = grid.findParentByType('contactslayout');
@@ -108,5 +17,5 @@ Compass.ErpApp.Organizer.Applications.BillPay.loadExtensions = function(){
         }
       }
     }
-  });
-};
+
+});

data/public/javascripts/erp_app/organizer/applications/bill_pay/make_payment_window.js

@@ -3,22 +3,25 @@ Ext.define("Compass.ErpApp.Organizer.Applications.BillPay.MakePaymentWindow",{
   alias:'widget.billpay_makepaymentwindow',
   constructor : function(config) {
     config = Ext.apply({
+      id: 'billpay_makepayment_window',
       layout:'fit',
       width:300,
       title:'Make Payment',
-      iconCls:'icon-credit_cards',
+      iconCls:'icon-creditcards',
       buttonAlign:'center',
       plain: true,
       items: Ext.create('Ext.form.Panel',{
+        id: 'billpay_makepayment_form',
         baseParams:{
-          account_id:config.accountId
+          billing_account_id:config.billing_account_id
         },
         url:config['url'],
         items: [
         {
-          xtype:'displayfield',
+          xtype:'numberfield',
           value:config['amount'],
-          fieldLabel:'Amount'
+          fieldLabel:'Amount',
+          name: 'amount'
         },
         {
           xtype:'combo',
@@ -58,21 +61,24 @@ Ext.define("Compass.ErpApp.Organizer.Applications.BillPay.MakePaymentWindow",{
         text:'Submit',
         listeners:{
           'click':function(button){
-            var win = button.findParentByType('creditcardwindow');
-            var formPanel = win.findByType('form')[0];
+            var win = Ext.getCmp('billpay_makepayment_window');
+            var formPanel = Ext.getCmp('billpay_makepayment_form');
             //formPanel.findById('credit_card_amount_hidden').setValue(formPanel.findById('credit_card_amount').getValue().replace("$","").replace(",",""));
-            if(win.validateCreditCardInfo(formPanel.getForm())){
+            //if(win.validateCreditCardInfo(formPanel.getForm())){
               formPanel.getForm().submit({
                 method:config['method'] || 'POST',
                 waitMsg:'Processing Credit Card...',
                 success:function(form, action){
-                  var response =  Ext.util.JSON.decode(action.response.responseText);
-                  win.fireEvent('charge_response', win, response);
+                  var response =  Ext.decode(action.response.responseText);
+                  //win.fireEvent('charge_response', win, response);
+                  if (response.success == true){ win.destroy(); }
+                  Ext.Msg.alert('Success','Payment Successful');
                 },
                 failure:function(form, action){
                   if(action.response != null){
-                    var response =  Ext.util.JSON.decode(action.response.responseText);
-                    win.fireEvent('charge_failure', win, response);
+                    var response =  Ext.decode(action.response.responseText);
+                    //win.fireEvent('charge_failure', win, response);
+                    Ext.Msg.alert('Error','Payment Failed');
                   }
                   else
                   {
@@ -80,7 +86,7 @@ Ext.define("Compass.ErpApp.Organizer.Applications.BillPay.MakePaymentWindow",{
                   }
                 }
               });
-            }
+            //}
           }
         }
       },
@@ -89,7 +95,7 @@ Ext.define("Compass.ErpApp.Organizer.Applications.BillPay.MakePaymentWindow",{
         listeners:{
           'click':function(button){
             var win = button.findParentByType('billpay_makepaymentwindow');
-            win.close();
+            win.destroy();
           }
         }
       }]

data/public/javascripts/erp_app/organizer/applications/bill_pay/payment_accounts_grid_panel.js

@@ -1,6 +1,6 @@
 Ext.define("Compass.ErpApp.Organizer.Applications.BillPay.PaymentAccountsGridPanel",{
   extend:"Ext.grid.Panel",
-  alias:'widget.billpay_paymentaccountsgridpanel',
+  alias:'widget.billpay-paymentaccountsgridpanel',
 
   initComponent : function(){
     this.bbar = Ext.create("Ext.PagingToolbar",{
@@ -16,6 +16,7 @@ Ext.define("Compass.ErpApp.Organizer.Applications.BillPay.PaymentAccountsGridPan
 
   constructor : function(config) {
     var store = Ext.create("Ext.data.Store",{
+      autoLoad: true,
       proxy:{
         type:'ajax',
         url: '/erp_invoicing/erp_app/organizer/bill_pay/accounts/payment_accounts',

data/public/javascripts/erp_app/shared/add_invoice_window.js

@@ -0,0 +1,220 @@
+Ext.define("Compass.ErpApp.Shared.AddInvoiceWindow",{
+  extend:"Ext.window.Window",
+  alias:'widget.shared-addinvoicewindow',
+  initComponent : function() {
+    this.addEvents(
+      "create_success",
+      "create_failure"
+      );
+
+    this.callParent(this.arguments);
+  },
+  constructor : function(config) {
+    var form = Ext.create("Ext.form.Panel",{
+      labelWidth:110,
+      frame:false,
+      bodyStyle:'padding:5px 5px 0',
+      autoHeight:true,
+      url:'/erp_invoicing/erp_app/shared/invoices/create_invoice',
+      items: [{
+        xtype: 'textfield',
+        fieldLabel:'Invoice Number',
+        name:'invoice_number',
+        allowBlank:false
+      },
+      {
+        xtype: 'textarea',
+        height:100,
+        fieldLabel:'Description',
+        name:'description',
+        allowBlank:false
+      },
+      {
+        xtype: 'textarea',
+        height:100,
+        fieldLabel:'Message',
+        name:'message',
+        allowBlank:true
+      },
+      {
+        xtype: 'datefield',
+        fieldLabel:'Invoice Date',
+        name:'invoice_date',
+        allowBlank:false
+      },
+      {
+        xtype: 'datefield',
+        fieldLabel:'Due Date',
+        name:'due_date',
+        allowBlank:false
+      }
+      //        {
+      //          xtype:'combo',
+      //          hiddenName:'billed_from_party_id',
+      //          name:'billed_from_party_id',
+      //          loadingText:'Retrieving Parties...',
+      //          store:Ext.create('Ext.data.Store',{
+      //            proxy:{
+      //              type:'ajax',
+      //              reader:{
+      //                type:'json',
+      //                root:'parties'
+      //              },
+      //              url:'/erp_invoicing/erp_app/desktop/invoice_management/parties'
+      //            },
+      //            fields:[
+      //            {
+      //              name:'id'
+      //            },
+      //            {
+      //              name:'description'
+      //
+      //            }
+      //            ]
+      //          }),
+      //          forceSelection:true,
+      //          editable:true,
+      //          fieldLabel:'Billed From Party',
+      //          autoSelect:true,
+      //          typeAhead: true,
+      //          mode: 'remote',
+      //          displayField:'description',
+      //          valueField:'id',
+      //          triggerAction: 'all',
+      //          allowBlank:true
+      //        },
+      //        {
+      //          xtype:'combo',
+      //          hiddenName:'billed_to_party_id',
+      //          name:'billed_to_party_id',
+      //          loadingText:'Retrieving Parties...',
+      //          store:Ext.create('Ext.data.Store',{
+      //            proxy:{
+      //              type:'ajax',
+      //              reader:{
+      //                type:'json',
+      //                root:'parties'
+      //              },
+      //              url:'/erp_invoicing/erp_app/desktop/invoice_management/parties'
+      //            },
+      //            fields:[
+      //            {
+      //              name:'id'
+      //            },
+      //            {
+      //              name:'description'
+      //
+      //            }
+      //            ]
+      //          }),
+      //          forceSelection:true,
+      //          editable:true,
+      //          fieldLabel:'Billed To Party',
+      //          autoSelect:true,
+      //          typeAhead: true,
+      //          mode: 'remote',
+      //          displayField:'description',
+      //          valueField:'id',
+      //          triggerAction: 'all',
+      //          allowBlank:true
+      //        }
+      ]
+    });
+
+    if(!Compass.ErpApp.Utility.isBlank(config['billingAccountNumber'])){
+      form.add({
+        xtype:'displayfield',
+        fieldLabel:'Billing Account',
+        value:config['billingAccountNumber']
+      });
+      form.add({
+        xtype:'hidden',
+        name:'billing_account_id',
+        value:config['billingAccountId']
+      });
+    }
+    else{
+      form.add({
+        xtype:'combo',
+        hiddenName:'billing_account_id',
+        name:'billing_account_id',
+        itemId:'billingAccountIdCombo',
+        loadingText:'Retrieving Billing Accounts...',
+        store:{
+          autoLoad:true,
+          xtype:'store',
+          proxy:{
+            type:'ajax',
+            reader:{
+              type:'json',
+              root:'billing_accounts'
+            },
+            url:'/erp_invoicing/erp_app/shared/invoices/billing_accounts'
+          },
+          fields:[
+          {
+            name:'id'
+          },
+          {
+            name:'account_number'
+          }
+          ]
+        },
+        forceSelection:true,
+        editable:true,
+        fieldLabel:'Billing Account',
+        autoSelect:true,
+        typeAhead: true,
+        mode: 'remote',
+        displayField:'account_number',
+        valueField:'id',
+        triggerAction: 'all',
+        allowBlank:false
+      });
+    }
+
+    config = Ext.apply({
+      title:'Add Invoice',
+      iconCls:'icon-add',
+      buttonAlign:'center',
+      plain: true,
+      items: [form],
+      buttons: [{
+        text:'Submit',
+        listeners:{
+          'click':function(button){
+            var win = button.findParentByType('shared-addinvoicewindow');
+            var formPanel = win.query('form')[0];
+            formPanel.getForm().submit({
+              method:'POST',
+              waitMsg:'Creating...',
+              success:function(form, action){
+                var response =  Ext.decode(action.response.responseText);
+                win.fireEvent('create_success', win, response);
+                win.close();
+              },
+              failure:function(form, action){
+                Ext.Msg.alert('Error', 'Error creating invoice.');
+              }
+            });
+          }
+        }
+      },
+      {
+        text: 'Cancel',
+        listeners:{
+          'click':function(button){
+            var win = button.findParentByType('shared-addinvoicewindow');
+            var form = win.query('form')[0];
+            form.getForm().reset();
+            win.close();
+          }
+        }
+      }
+      ]
+    }, config);
+
+    this.callParent([config]);
+  }
+
+});