erp_commerce 3.1.1 → 3.1.2

data/app/widgets/orders/javascript/orders.js

@@ -1,6 +1,7 @@
 Compass.ErpApp.Widgets.Orders = {
+    template: new Ext.Template("<%= render_widget :orders %>"),
     add:function(){
-        Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror("<%= render_widget :orders %>");
+        Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror(Compass.ErpApp.Widgets.Orders.template.apply());
     }
 }
 

data/app/widgets/product_catalog/javascript/product_catalog.js

@@ -1,4 +1,8 @@
 Compass.ErpApp.Widgets.ProductCatalog = {
+    template: new Ext.XTemplate("<%= render_widget :product_catalog,\n",
+        "   :action => :index,\n",
+        "   :params => {:cart_items_url => '{cartItemsUrl}'} %>"),
+
     add:function(){
         var addProductCatalogWidgetWindow = Ext.create("Ext.window.Window",{
             layout:'fit',
@@ -34,12 +38,8 @@ Compass.ErpApp.Widgets.ProductCatalog = {
                         cartItemsUrl:cartItemsUrl
                     };
 
-                    var tpl = new Ext.XTemplate("<%= render_widget :product_catalog,\n",
-                        "   :action => :index,\n",
-                        "   :params => {:cart_items_url => '{cartItemsUrl}'} %>");
-
                     //add rendered template to center region editor
-                    Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror(tpl.apply(data));
+                    Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror(Compass.ErpApp.Widgets.ProductCatalog.template.apply(data));
                     addProductCatalogWidgetWindow.close();
                 }
             },

data/app/widgets/shopping_cart/javascript/shopping_cart.js

@@ -1,99 +1,102 @@
 Compass.ErpApp.Widgets.ShoppingCart = {
-    addShoppingCart:function(){
-        var addShoppingCartWidget = Ext.create("Ext.window.Window",{
-            layout:'fit',
-            width:300,
-            title:'Add Shopping Cart Widget',
-            height:130,
-            buttonAlign:'center',
-            items: Ext.create("Ext.form.Panel",{
+    template: new Ext.Template("<%= render_widget :shopping_cart,\n",
+        "   :action => {action},\n",
+        "   :params => {:{symbol} => '{url}'} %>"),
+
+    addShoppingCart: function () {
+        var addShoppingCartWidget = Ext.create("Ext.window.Window", {
+            layout: 'fit',
+            width: 300,
+            title: 'Add Shopping Cart Widget',
+            height: 130,
+            buttonAlign: 'center',
+            items: Ext.create("Ext.form.Panel", {
                 labelWidth: 100,
-                frame:false,
-                bodyStyle:'padding:5px 5px 0',
+                frame: false,
+                bodyStyle: 'padding:5px 5px 0',
                 defaults: {
                     width: 225
                 },
                 items: [
-                {
-                    xtype: 'combo',
-                    forceSelection:true,
-                    store: [
-                    [':price_summary','Price Summary'],
-                    [':cart_items','Cart Items'],
-                    ],
-                    fieldLabel: 'Widget View',
-                    value:':price_summary',
-                    name: 'widgetLayout',
-                    allowBlank: false,
-                    triggerAction: 'all',
-                    listeners:{
-                        change:function(field, newValue, oldValue){
-                            var basicForm = field.findParentByType('form').getForm();
-                            var cartItemsUrlField = basicForm.findField('cartItemsUrl');
-                            var productsUrlField = basicForm.findField('productsUrl');
-                            if(newValue == ':price_summary'){
-                                cartItemsUrlField.show();
-                                productsUrlField.hide();
-                                cartItemsUrlField.setValue('/cart-summary');
-                            }
-                            else{
-                                productsUrlField.show();
-                                cartItemsUrlField.hide();
-                                productsUrlField.setValue('/products');
+                    {
+                        xtype: 'combo',
+                        forceSelection: true,
+                        store: [
+                            [':price_summary', 'Price Summary'],
+                            [':cart_items', 'Cart Items']
+                        ],
+                        fieldLabel: 'Widget View',
+                        value: ':price_summary',
+                        name: 'widgetLayout',
+                        allowBlank: false,
+                        triggerAction: 'all',
+                        listeners: {
+                            change: function (field, newValue, oldValue) {
+                                var basicForm = field.findParentByType('form').getForm();
+                                var cartItemsUrlField = basicForm.findField('cartItemsUrl');
+                                var productsUrlField = basicForm.findField('productsUrl');
+                                if (newValue == ':price_summary') {
+                                    cartItemsUrlField.show();
+                                    productsUrlField.hide();
+                                    cartItemsUrlField.setValue('/cart-summary');
+                                }
+                                else {
+                                    productsUrlField.show();
+                                    cartItemsUrlField.hide();
+                                    productsUrlField.setValue('/products');
+                                }
                             }
                         }
+                    },
+                    {
+                        xtype: 'textfield',
+                        fieldLabel: 'Cart Items Url',
+                        name: 'cartItemsUrl',
+                        hidden: false,
+                        value: '/cart-items'
+                    },
+                    {
+                        xtype: 'textfield',
+                        fieldLabel: 'Products Url',
+                        name: 'productsUrl',
+                        value: '/products',
+                        hidden: true
                     }
-                },
-                {
-                    xtype:'textfield',
-                    fieldLabel:'Cart Items Url',
-                    name:'cartItemsUrl',
-                    hidden:false,
-                    value:'/cart-items'
-                },
-                {
-                    xtype:'textfield',
-                    fieldLabel:'Products Url',
-                    name:'productsUrl',
-                    value:'/products',
-                    hidden:true
-                },
                 ]
             }),
-            buttons: [{
-                text:'Submit',
-                listeners:{
-                    'click':function(button){
-                        var window = button.findParentByType('window');
-                        var formPanel = window.query('form')[0];
-                        var basicForm = formPanel.getForm();
-                        var action = basicForm.findField('widgetLayout').getValue();
-
-                        var data = {action:action};
-                        if(action == ':price_summary'){
-                            data.symbol = 'cart_items_url';
-                            data.url = basicForm.findField('cartItemsUrl').getValue();
-                        }
-                        else{
-                            data.symbol = 'products_url';
-                            data.url = basicForm.findField('productsUrl').getValue();
-                        }
+            buttons: [
+                {
+                    text: 'Submit',
+                    listeners: {
+                        'click': function (button) {
+                            var window = button.findParentByType('window');
+                            var formPanel = window.query('form')[0];
+                            var basicForm = formPanel.getForm();
+                            var action = basicForm.findField('widgetLayout').getValue();
 
-                        var tpl = new Ext.XTemplate("<%= render_widget :shopping_cart,\n",
-                                                    "   :action => {action},\n",
-                                                    "   :params => {:{symbol} => '{url}'} %>");
+                            var data = {action: action};
+                            if (action == ':price_summary') {
+                                data.symbol = 'cart_items_url';
+                                data.url = basicForm.findField('cartItemsUrl').getValue();
+                            }
+                            else {
+                                data.symbol = 'products_url';
+                                data.url = basicForm.findField('productsUrl').getValue();
+                            }
 
-                        //add rendered template to center region editor
-                        Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror(tpl.apply(data));
+                            //add rendered template to center region editor
+                            Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror(Compass.ErpApp.Widgets.ShoppingCart.template.apply(data));
+                            addShoppingCartWidget.close();
+                        }
+                    }
+                },
+                {
+                    text: 'Close',
+                    handler: function () {
                         addShoppingCartWidget.close();
                     }
                 }
-            },{
-                text: 'Close',
-                handler: function(){
-                    addShoppingCartWidget.close();
-                }
-            }]
+            ]
 
         });
         addShoppingCartWidget.show();
@@ -101,7 +104,7 @@ Compass.ErpApp.Widgets.ShoppingCart = {
 }
 
 Compass.ErpApp.Widgets.AvailableWidgets.push({
-    name:'Shopping Cart',
-    iconUrl:'/images/icons/shoppingcart/shoppingcart_48x48.png',
-    onClick:Compass.ErpApp.Widgets.ShoppingCart.addShoppingCart
+    name: 'Shopping Cart',
+    iconUrl: '/images/icons/shoppingcart/shoppingcart_48x48.png',
+    onClick: Compass.ErpApp.Widgets.ShoppingCart.addShoppingCart
 });

data/lib/erp_commerce/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_commerce
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-25 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -174,53 +174,6 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/data_migrations/20101011152441_payment_gateway_actions.erp_commerce.rb
-- spec/dummy/db/data_migrations/20101014142230_financial_txn_types.erp_txns_and_accts.rb
-- spec/dummy/db/data_migrations/20110109173616_create_capability_scope_types.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20110324010232_product_role_types.erp_products.rb
-- spec/dummy/db/data_migrations/20110525001935_add_usd_currency.erp_base_erp_svcs.rb
-- spec/dummy/db/data_migrations/20110527160807_add_default_prod_avail_types.erp_products.rb
-- spec/dummy/db/data_migrations/20110605231556_create_order_party_roles.erp_orders.rb
-- spec/dummy/db/data_migrations/20110609150135_add_iso_codes.erp_base_erp_svcs.rb
-- spec/dummy/db/data_migrations/20110728201729_erp_app_setup.erp_app.rb
-- spec/dummy/db/data_migrations/20110728201730_create_desktop_app_product_manager.erp_products.rb
-- spec/dummy/db/data_migrations/20110728201731_create_desktop_app_order_manager.erp_orders.rb
-- spec/dummy/db/data_migrations/20110728201732_create_organizer_app_order_management.erp_orders.rb
-- spec/dummy/db/data_migrations/20110728201733_update_preferences.erp_app.rb
-- spec/dummy/db/data_migrations/20110802200222_schedule_delete_expired_sessions_job.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20110816161238_create_desktop_app_audit_log_viewer.erp_app.rb
-- spec/dummy/db/data_migrations/20110817160743_add_file_manager_application.erp_app.rb
-- spec/dummy/db/data_migrations/20110913145838_setup_compass_ae_instance.erp_base_erp_svcs.rb
-- spec/dummy/db/data_migrations/20111108183739_add_default_capabilities.erp_app.rb
-- spec/dummy/db/data_migrations/20111108183740_add_new_contact_widgets.erp_app.rb
-- spec/dummy/db/data_migrations/20111111144706_setup_audit_log_types.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20120109173616_create_download_capability_type.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20120229160222_add_userinfo_widget.erp_app.rb
-- spec/dummy/db/data_migrations/20120229174343_add_orders_widget.erp_orders.rb
-- spec/dummy/db/data_migrations/20120405193721_create_party_and_role_type_for_communication_events.erp_app.rb
-- spec/dummy/db/data_migrations/20120411180756_create_user_management_mobile_application.erp_app.rb
-- spec/dummy/db/data_migrations/20120418164215_create_configuration_management_desktop_application.erp_app.rb
-- spec/dummy/db/data_migrations/20121116155018_create_group_relationship_and_role_types.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20121130201859_upgrade_remove_system_mgmt_app.erp_app.rb
-- spec/dummy/db/data_migrations/20121130212146_note_capabilities.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20121218175028_create_security_management_desktop_application.erp_app.rb
-- spec/dummy/db/migrate/20130107214952_base_erp_services.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130107214953_base_tech_services.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130107214954_create_has_attribute_tables.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130107214955_create_groups.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130107214956_upgrade_security.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130107214957_upgrade_security2.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130107214958_base_app_framework.erp_app.rb
-- spec/dummy/db/migrate/20130107214959_base_txns_and_accts.erp_txns_and_accts.rb
-- spec/dummy/db/migrate/20130107214960_agreements_services.erp_agreements.rb
-- spec/dummy/db/migrate/20130107214961_agreements_services_indexes.erp_agreements.rb
-- spec/dummy/db/migrate/20130107214962_base_products.erp_products.rb
-- spec/dummy/db/migrate/20130107214963_base_products_indexes.erp_products.rb
-- spec/dummy/db/migrate/20130107214964_base_orders.erp_orders.rb
-- spec/dummy/db/migrate/20130107214965_erp_commerce_base.erp_commerce.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/spec.sqlite3
-- spec/dummy/log/spec.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -290,53 +243,6 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/data_migrations/20101011152441_payment_gateway_actions.erp_commerce.rb
-- spec/dummy/db/data_migrations/20101014142230_financial_txn_types.erp_txns_and_accts.rb
-- spec/dummy/db/data_migrations/20110109173616_create_capability_scope_types.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20110324010232_product_role_types.erp_products.rb
-- spec/dummy/db/data_migrations/20110525001935_add_usd_currency.erp_base_erp_svcs.rb
-- spec/dummy/db/data_migrations/20110527160807_add_default_prod_avail_types.erp_products.rb
-- spec/dummy/db/data_migrations/20110605231556_create_order_party_roles.erp_orders.rb
-- spec/dummy/db/data_migrations/20110609150135_add_iso_codes.erp_base_erp_svcs.rb
-- spec/dummy/db/data_migrations/20110728201729_erp_app_setup.erp_app.rb
-- spec/dummy/db/data_migrations/20110728201730_create_desktop_app_product_manager.erp_products.rb
-- spec/dummy/db/data_migrations/20110728201731_create_desktop_app_order_manager.erp_orders.rb
-- spec/dummy/db/data_migrations/20110728201732_create_organizer_app_order_management.erp_orders.rb
-- spec/dummy/db/data_migrations/20110728201733_update_preferences.erp_app.rb
-- spec/dummy/db/data_migrations/20110802200222_schedule_delete_expired_sessions_job.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20110816161238_create_desktop_app_audit_log_viewer.erp_app.rb
-- spec/dummy/db/data_migrations/20110817160743_add_file_manager_application.erp_app.rb
-- spec/dummy/db/data_migrations/20110913145838_setup_compass_ae_instance.erp_base_erp_svcs.rb
-- spec/dummy/db/data_migrations/20111108183739_add_default_capabilities.erp_app.rb
-- spec/dummy/db/data_migrations/20111108183740_add_new_contact_widgets.erp_app.rb
-- spec/dummy/db/data_migrations/20111111144706_setup_audit_log_types.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20120109173616_create_download_capability_type.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20120229160222_add_userinfo_widget.erp_app.rb
-- spec/dummy/db/data_migrations/20120229174343_add_orders_widget.erp_orders.rb
-- spec/dummy/db/data_migrations/20120405193721_create_party_and_role_type_for_communication_events.erp_app.rb
-- spec/dummy/db/data_migrations/20120411180756_create_user_management_mobile_application.erp_app.rb
-- spec/dummy/db/data_migrations/20120418164215_create_configuration_management_desktop_application.erp_app.rb
-- spec/dummy/db/data_migrations/20121116155018_create_group_relationship_and_role_types.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20121130201859_upgrade_remove_system_mgmt_app.erp_app.rb
-- spec/dummy/db/data_migrations/20121130212146_note_capabilities.erp_tech_svcs.rb
-- spec/dummy/db/data_migrations/20121218175028_create_security_management_desktop_application.erp_app.rb
-- spec/dummy/db/migrate/20130107214952_base_erp_services.erp_base_erp_svcs.rb
-- spec/dummy/db/migrate/20130107214953_base_tech_services.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130107214954_create_has_attribute_tables.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130107214955_create_groups.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130107214956_upgrade_security.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130107214957_upgrade_security2.erp_tech_svcs.rb
-- spec/dummy/db/migrate/20130107214958_base_app_framework.erp_app.rb
-- spec/dummy/db/migrate/20130107214959_base_txns_and_accts.erp_txns_and_accts.rb
-- spec/dummy/db/migrate/20130107214960_agreements_services.erp_agreements.rb
-- spec/dummy/db/migrate/20130107214961_agreements_services_indexes.erp_agreements.rb
-- spec/dummy/db/migrate/20130107214962_base_products.erp_products.rb
-- spec/dummy/db/migrate/20130107214963_base_products_indexes.erp_products.rb
-- spec/dummy/db/migrate/20130107214964_base_orders.erp_orders.rb
-- spec/dummy/db/migrate/20130107214965_erp_commerce_base.erp_commerce.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/db/spec.sqlite3
-- spec/dummy/log/spec.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html

data/spec/dummy/db/data_migrations/20101011152441_payment_gateway_actions.erp_commerce.rb

@@ -1,28 +0,0 @@
-# This migration comes from erp_commerce (originally 20101011152441)
-class PaymentGatewayActions
-  
-  def self.up
-    PaymentGatewayAction.create(
-      :internal_identifier => 'capture',
-      :description => 'capture'
-    )
-
-    PaymentGatewayAction.create(
-      :internal_identifier => 'authorize',
-      :description => 'Authorize'
-    )
-
-    PaymentGatewayAction.create(
-      :internal_identifier => 'full_reverse_of_authorization',
-      :description => 'Full Reverse Of Authorization'
-    )
-  end
-  
-  def self.down
-    ['sale','void_sale','authorize'].each do |iid|
-      type = PaymentGatewayAction.find_by_internal_identifier(iid)
-      type.destroy unless type.nil?
-    end
-  end
-
-end

data/spec/dummy/db/data_migrations/20101014142230_financial_txn_types.erp_txns_and_accts.rb

@@ -1,16 +0,0 @@
-# This migration comes from erp_txns_and_accts (originally 20101014142230)
-class FinancialTxnTypes
-  
-  def self.up
-    BizTxnType.create(
-      :description => "Payment Transaction",
-      :internal_identifier => 'payment_txn'
-    )
-  end
-  
-  def self.down
-    type = BizTxnType.iid('payment_txn')
-    type.destroy unless type.nil?
-  end
-
-end

data/spec/dummy/db/data_migrations/20110109173616_create_capability_scope_types.erp_tech_svcs.rb

@@ -1,15 +0,0 @@
-# This migration comes from erp_tech_svcs (originally 20110109173616)
-class CreateCapabilityScopeTypes
-  
-  def self.up
-    CapabilityType.create(:internal_identifier => 'download', :description => 'Download') if CapabilityType.where("internal_identifier = 'download'").first.nil?
-
-    ScopeType.create(:description => 'Instance', :internal_identifier => 'instance') if ScopeType.where("internal_identifier = 'instance'").first.nil?
-    ScopeType.create(:description => 'Class', :internal_identifier => 'class') if ScopeType.where("internal_identifier = 'class'").first.nil?
-    ScopeType.create(:description => 'Query', :internal_identifier => 'query') if ScopeType.where("internal_identifier = 'query'").first.nil?
-  end
-  
-  def self.down
-  end
-
-end

data/spec/dummy/db/data_migrations/20110324010232_product_role_types.erp_products.rb

@@ -1,24 +0,0 @@
-# This migration comes from erp_products (originally 20110324010232)
-class ProductRoleTypes
-  
-  def self.up
-    ProdTypeRelnType.create(:internal_identifier => 'product_type_package_reln', :description => 'Product Type Package Relationship')
-    ProdTypeRoleType.create(:internal_identifier => 'product_type_package', :description => 'Product Type Package')
-    ProdTypeRoleType.create(:internal_identifier => 'packaged_product_type', :description => 'Packaged Product Type')
-
-    ProdInstanceRelnType.create(:internal_identifier => 'product_instance_package_reln', :description => 'Product Instance Package Relantionship')
-    ProdInstanceRoleType.create(:internal_identifier => 'product_instance_package', :description => 'Product Instance Package')
-    ProdInstanceRoleType.create(:internal_identifier => 'packaged_product_instance', :description => 'Packaged Product Instance')
-  end
-  
-  def self.down
-   ['product_type_package_reln','product_type_package','packaged_product_type'].each do |iid|
-     ProdTypeRelnType.iid(iid).destroy
-   end
-
-    ['product_instance_package_reln','product_instance_package','packaged_product_instance'].each do |iid|
-     ProdInstanceRoleType.iid(iid).destroy
-   end
-  end
-
-end