erp_commerce 3.0.7 → 3.0.8

data/lib/erp_commerce/version.rb

@@ -2,7 +2,7 @@ module ErpCommerce
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 7
+    TINY  = 8
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end

data/public/javascripts/extensions/compass_ae/erp_app/desktop/applications/product_manager/product_pricing_panel.js

@@ -0,0 +1,329 @@
+//
+//form to manage pricing
+//
+
+Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.ProductPricingPanel",{
+  extend:"Ext.panel.Panel",
+  alias:'widget.productmanager_productpricingpanel',
+  updatePrice : function(rec){
+    this.addEditPriceBtn.setText('Update Price');
+    this.cancelBtn.show();
+    this.addPriceFormPanel.getForm().setValues(rec.data);
+  },
+
+  deletePrice : function(rec){
+    var self = this;
+    Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete this price?', function(btn){
+      if(btn == 'no'){
+        return false;
+      }
+      else
+      {
+        Ext.Ajax.request({
+          url: '/erp_products/erp_app/desktop/product_manager/delete_price/'+rec.get('pricing_plan_id'),
+          success: function(response) {
+            var obj =  Ext.decode(response.responseText);
+            if(obj.success){
+              Ext.getCmp('productListPanel').loadProducts();
+              self.pricesGridPanel.getStore().load();
+            }
+            else{
+              Ext.Msg.alert('Error', 'Error deleting price.');
+            }
+          },
+          failure: function(response) {
+            Ext.Msg.alert('Error', 'Error deleting price.');
+          }
+        });
+      }
+    });
+  },
+
+  constructor : function(config) {
+    var self = this;
+    var productTypeId = Compass.ErpApp.Desktop.Applications.ProductManager.selectedProductTypeId;
+
+    this.pricesGridPanel = Ext.create("Ext.grid.Panel",{
+      layout:'fit',
+      region:'center',
+      split:true,
+      columns: [
+      {
+        header:'Description',
+        width:310,
+        sortable: false,
+        dataIndex: 'description'
+      },
+      {
+        header: 'Price',
+        width: 75,
+        sortable: true,
+        dataIndex: 'price',
+        renderer:function(v){
+          return v.toFixed(2);
+        }
+      },
+      {
+        header: 'Currency',
+        width: 75,
+        sortable: true,
+        dataIndex: 'currency_display'
+      },
+      {
+        header: 'From Date',
+        width: 90,
+        sortable: true,
+        dataIndex: 'from_date',
+        renderer: Ext.util.Format.dateRenderer('m/d/Y')
+      },
+      {
+        header: 'Thru Date',
+        width: 90,
+        sortable: true,
+        dataIndex: 'thru_date',
+        renderer: Ext.util.Format.dateRenderer('m/d/Y')
+      },
+      {
+        menuDisabled:true,
+        resizable:false,
+        xtype:'actioncolumn',
+        header:'Update',
+        align:'center',
+        width:60,
+        items:[{
+          icon:'/images/icons/edit/edit_16x16.png',
+          tooltip:'Update',
+          handler :function(grid, rowIndex, colIndex){
+            var rec = grid.getStore().getAt(rowIndex);
+            self.updatePrice(rec);
+          }
+        }]
+      },
+      {
+        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);
+            self.deletePrice(rec);
+          }
+        }]
+      },
+      {
+        menuDisabled:true,
+        resizable:false,
+        xtype:'actioncolumn',
+        header:'Comment',
+        align:'center',
+        width:60,
+        items:[{
+          getClass: function(v, meta, rec) {  // Or return a class from a function
+            this.items[0].tooltip = rec.get('comments');
+            return 'info-col';
+          },
+          handler: function(grid, rowIndex, colIndex) {
+            return false;
+          }
+        }]
+      }
+      ],
+      loadMask: true,
+      stripeRows: true,
+      store: Ext.create("Ext.data.Store",{
+        autoLoad: true,
+        proxy:{
+          type:'ajax',
+          url: '/erp_products/erp_app/desktop/product_manager/prices/'+productTypeId,
+          reader:{
+            root: 'prices',
+            type:'json'
+          }
+        },
+        fields:[{
+          name:'price',
+          type:'decimal'
+        }, 'currency', 'currency_display', 'from_date', 'thru_date', 'description','comments','pricing_plan_id']
+      })
+    });
+
+    this.addEditPriceBtn = Ext.create("Ext.button.Button",{
+      scope:this,
+      text:'Add Price',
+      handler:function(btn){
+        var formPanel = btn.findParentByType('form');
+        var basicForm = formPanel.getForm();
+
+        basicForm.submit({
+          reset:true,
+          success:function(form, action){
+            var obj =  Ext.decode(action.response.responseText);
+            if(obj.success){
+              self.addEditPriceBtn.setText('Add Price');
+              self.cancelBtn.hide();
+              Ext.getCmp('productListPanel').loadProducts();
+              self.pricesGridPanel.getStore().load();
+            }
+            else{
+              Ext.Msg.alert("Error", 'Error creating price');
+            }
+          },
+          failure:function(form, action){
+            Ext.Msg.alert("Error", 'Error creating price');
+          }
+        });
+      }
+    });
+
+    this.cancelBtn = Ext.create("Ext.button.Button",{
+      text:'Cancel',
+      hidden:true,
+      handler:function(btn){
+        var formPanel = btn.findParentByType('form');
+        var basicForm = formPanel.getForm();
+        basicForm.reset();
+        self.addEditPriceBtn.setText('Add Price');
+        self.cancelBtn.hide();
+      }
+    });
+
+    this.addPriceFormPanel = Ext.create("Ext.form.Panel",{
+      layout:'anchor',
+      collapsible:true,
+      split:true,
+      height:175,
+      frame:true,
+      region:'south',
+      buttonAlign:'center',
+      bodyStyle:'padding:5px 5px 0',
+      url:'/erp_products/erp_app/desktop/product_manager/new_and_update_price',
+      items: [
+      {
+        xtype:'textfield',
+        width:400,
+        name:'description',
+        fieldLabel:'Description'
+      },
+      {
+        layout:'column',
+        xtype:'container',
+        frame:false,
+        border:false,
+        defaults:{
+          columnWidth:0.25,
+          border:false,
+          frame:false,
+          xtype:'container',
+          bodyStyle:'padding:0 18px 0 0'
+        },
+        items:[{
+          items:[
+          {
+            fieldLabel:'Price',
+            xtype:'numberfield',
+            width:200,
+            layout:'anchor',
+            allowBlank:false,
+            name:'price'
+          }
+          ]
+        },
+        {
+          items:[
+          {
+            fieldLabel:'Currency',
+            xtype:'combo',
+            width:200,
+            id : 'call_center_party_country',
+            allowBlank : false,
+            store :Ext.create("Ext.data.Store",{
+              autoLoad: true,
+              proxy:{
+                type:'ajax',
+                url: '/erp_products/erp_app/desktop/product_manager/currencies',
+                reader:{
+                  root: 'currencies',
+                  type:'json'
+                }
+              },
+              fields: [
+              {
+                name:'internal_identifier'
+              },
+              {
+                name:'id'
+              }
+              ]
+            }),
+            hiddenName: 'currency',
+            hiddenField: 'currency',
+            valueField: 'id',
+            displayField: 'internal_identifier',
+            forceSelection : true,
+            triggerAction : 'all',
+            name:'currency'
+          }
+          ]
+        },
+        {
+          items:[
+          {
+            fieldLabel:'From Date',
+            xtype:'datefield',
+            width:200,
+            allowBlank:false,
+            name:'from_date'
+          }
+          ]
+        },
+        {
+          items:[
+          {
+            fieldLabel:'Thru Date',
+            xtype:'datefield',
+            width:200,
+            allowBlank:false,
+            name:'thru_date'
+          }
+          ]
+        }]
+      },
+      {
+        xtype:'textarea',
+        height:50,
+        width:400,
+        name:'comments',
+        fieldLabel:'Comments'
+      },
+      {
+        xtype:'hidden',
+        name:'product_type_id',
+        value:productTypeId
+      },
+      {
+        xtype:'hidden',
+        name:'pricing_plan_id'
+      }
+      ],
+      buttons:[
+      this.addEditPriceBtn,
+      this.cancelBtn
+      ]
+    });
+
+    config = Ext.apply({
+      title:'Pricing',
+      layout:'border',
+      items:[this.pricesGridPanel,this.addPriceFormPanel]
+    }, config);
+
+    this.callParent([config]);
+  }
+});
+
+Compass.ErpApp.Desktop.Applications.ProductManager.widgets.push({xtype:'productmanager_productpricingpanel'});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_commerce
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,43 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
-  requirement: &70216164581040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70216164581040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70216164580540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.20.4
   type: :runtime
   prerelease: false
-  version_requirements: *70216164580540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.20.4
 - !ruby/object:Gem::Dependency
   name: erp_orders
-  requirement: &70216164580060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70216164580060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: prismpay
-  requirement: &70216164579660 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70216164579660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
-  requirement: &70216164579120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +85,12 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70216164579120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: The CompassAE Commerce Engine uses the engines that implement Parties,
   Products and Orders, and adds the ability to conduct commerce. It implements a pricing
   engine, fees, payment gateways.
@@ -151,6 +176,7 @@ files:
 - lib/erp_commerce/version.rb
 - lib/erp_commerce.rb
 - lib/tasks/erp_commerce_tasks.rake
+- public/javascripts/extensions/compass_ae/erp_app/desktop/applications/product_manager/product_pricing_panel.js
 - GPL-3-LICENSE
 - Rakefile
 - README.md
@@ -217,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The CompassAE Commerce Engine uses the engines that implement Parties, Products