caboose-cms 0.5.145 → 0.5.146

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Zjk4OTU1YWUyMzU5YmFiOWNjYzc3NTMyYThkOWFjMDcxYzNjYjBlOQ==
+    ZDg5NjBiNWNmY2UzNTI3YWY0YzIwYmRkZWNmZjRiNmRjODQ3MjVmNg==
   data.tar.gz: !binary |-
-    YWI0OTVkODQyOTY5Yjc0NmQzOGQyMzBlMTRlNGJiYTgzNTRjYWM5Mw==
+    Y2I1YTJmMWRhYzE4NmNiZGVlMjllODM0MjZiNDEyZjg4MzNhOTE2Zg==
 SHA512:
   metadata.gz: !binary |-
-    YTE1OTI2ZGQ5MzIyMmIwOTBiNGRmMDJkZjdkMjBhZjUwMDczYmFjYTcwYjJl
-    MjMwMWRiY2Y1OGYzZTM4MjQ0MThlYTg0NGIyMTM0NjI1YmQ2ZjI1NTk2ZDU5
-    OTEyYTg2ZmQzOGE3OTRmYWVjMjU5ODMzOTU5MGVhN2QxMmY5ODc=
+    MzA4YTM2ZmVhNjQxMDk2M2UyMWFjNGNjNjA0YTY4YTY5ZWZmNTY4NThhODNh
+    MDQxNGU1MzRjN2VlZDhhNjE0MWI0N2QyNmNiNWI1NzFiMjA2YTI4N2ZmY2Yz
+    ZDg4ZjBiMzk0MmZhZDY1NzVmOWJjYzM1ZGMzNmFlNmRjMmMwNzk=
   data.tar.gz: !binary |-
-    MmQwZjQ1MTA2YTQ4ZGFmOWI0MjFjZDZlMTA0NGUyYTcwMWNmYjI4NWVkYjg4
-    NTIyNmYxYjNkMjBkNTBmMzJkYWRmZjhhNzlkOWQ4NzBlOTU4MjI0ZWJmZGMx
-    MTc1YTk5YzI3ZTE1NTljOGJiOWZlNmVjMjAxODQ5MzcxMjhkYTI=
+    MTYxZGU4ZDczZmUwYzEyOGQ0MmVhNWY0ZWZlZmYxZGVjMDE3MjJiYWJiNmEz
+    MWMzYjZlNWUxNGQ4MmYyMzM5MGEyYTUzMzlhYTE3M2RhYjJlZGNhNjJjMTVk
+    NDgyYjEwNTVkNDA1NWZjNGI4MzI0MjRiMzcyNDNkOWExOThjYjQ=

data/app/assets/javascripts/caboose/admin_edit_order.js

@@ -250,7 +250,8 @@ OrderController.prototype = {
     var table = $('<table/>').addClass('data');
     table.append($('<tr/>')  
       .append($('<th/>').html('Customer'))
-      .append($('<th/>').html('Shipping Address'))  
+      .append($('<th/>').html('Shipping Address'))
+      .append($('<th/>').html('Billing Address'))
       .append($('<th/>').html('Order Status'))
       .append($('<th/>').html('Payment Status'))      
     );    
@@ -275,6 +276,16 @@ OrderController.prototype = {
           });
         }))
       )
+      .append($('<td/>').attr('valign', 'top')
+        .append($('<div/>').attr('id', 'billing_address').append(that.noneditable_billing_address(true)))
+        .append($('<a/>').attr('href', '#').html('Edit').click(function(e) {
+          var a = $(this);
+          that.refresh_order(function() {
+            if (a.html() == 'Edit') { that.edit_billing_address();        a.html('Finished'); }
+            else                    { that.noneditable_billing_address(); a.html('Edit');     }
+          });
+        }))
+      )
       .append($('<td/>').attr('valign', 'top').append($('<div/>').attr('id', 'order_' + that.order.id + '_status')))
       .append($('<td/>').attr('valign', 'top').attr('align', 'center').append(fstatus))      
     );
@@ -370,6 +381,62 @@ OrderController.prototype = {
     });
   },
   
+  noneditable_billing_address: function(return_element)
+  {
+    var that = this;
+    var sa = that.order.billing_address;
+    if (!sa) sa = {};
+    var str = '';
+    str += (sa.first_name ? sa.first_name : '[Empty first name]') + ' ';
+    str += (sa.last_name  ? sa.last_name  : '[Empty last name]');        
+    str += '<br />' + (sa.address1 ? sa.address1 : '[Empty address]');
+    if (sa.address2) str += "<br />" + sa.address2;             
+    str += '<br/>' + (sa.city ? sa.city : '[Empty city]') + ", " + (sa.state ? sa.state : '[Empty state]') + " " + (sa.zip ? sa.zip : '[Empty zip]');
+    if (return_element)
+      return str;
+    $('#billing_address').empty().append(str);
+  },
+  
+  edit_billing_address: function()
+  {
+    var that = this;
+    var sa = that.order.billing_address;
+    if (!sa) sa = { id: 1 };
+    var table = $('<table/>').addClass('billing_address')
+      .append($('<tr/>').append($('<td/>').append($('<table/>').append($('<tr/>')
+        .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_first_name')))
+        .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_last_name')))
+      ))))
+      .append($('<tr/>').append($('<td/>').append($('<table/>').append($('<tr/>')
+        .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_address1')))                                
+      ))))
+      .append($('<tr/>').append($('<td/>').append($('<table/>').append($('<tr/>')        
+        .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_address2')))                        
+      ))))
+      .append($('<tr/>').append($('<td/>').append($('<table/>').append($('<tr/>')
+        .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_city')))
+        .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_state')))        
+        .append($('<td/>').append($('<div/>').attr('id', 'billingaddress_' + sa.id + '_zip')))        
+      ))));
+    $('#billing_address').empty().append(table);
+            
+    new ModelBinder({
+      name: 'BillingAddress',
+      id: sa.id,
+      update_url: '/admin/orders/' + that.order.id + '/billing-address',
+      authenticity_token: that.authenticity_token,
+      attributes: [        
+        { name: 'first_name'  , nice_name: 'First Name' , type: 'text'  , value: sa.first_name , width: 150, fixed_placeholder: false },
+        { name: 'last_name'   , nice_name: 'Last Name'  , type: 'text'  , value: sa.last_name  , width: 150, fixed_placeholder: false },
+        { name: 'address1'    , nice_name: 'Address 1'  , type: 'text'  , value: sa.address1   , width: 320, fixed_placeholder: false },
+        { name: 'address2'    , nice_name: 'Address 2'  , type: 'text'  , value: sa.address2   , width: 320, fixed_placeholder: false },
+        { name: 'city'        , nice_name: 'City'       , type: 'text'  , value: sa.city       , width: 180, fixed_placeholder: false },
+        { name: 'state'       , nice_name: 'State'      , type: 'text'  , value: sa.state      , width: 40, fixed_placeholder: false },
+        { name: 'zip'         , nice_name: 'Zip'        , type: 'text'  , value: sa.zip        , width: 60, fixed_placeholder: false }
+      ]
+    });
+  },
+  
   // Show all the packages and the line items in each package
   order_packages_table: function(table)
   {
@@ -637,8 +704,8 @@ OrderController.prototype = {
       url: '/admin/orders/' + that.order.id + '/void',
       success: function(resp) {
         if (resp.error)   $('#message').html("<p class='note error'>" + resp.error + "</p>");
-        if (resp.success) $('#message').html("<p class='note success'>" + resp.success + "</p>");
-        if (resp.refresh) window.location.reload(true);
+        if (resp.success) that.refresh();
+        if (resp.refresh) that.refresh();
       }
     });
   },
@@ -661,8 +728,8 @@ OrderController.prototype = {
       url: '/admin/orders/' + that.order.id + '/capture',
       success: function(resp) {
         if (resp.error)   $('#message').html("<p class='note error'>" + resp.error + "</p>");
-        if (resp.success) $('#message').html("<p class='note success'>" + resp.success + "</p>");
-        if (resp.refresh) window.location.reload(true);
+        if (resp.success) that.refresh();
+        if (resp.refresh) that.refresh();
       }
     });
   }

data/app/controllers/caboose/billing_addresses_controller.rb

@@ -0,0 +1,50 @@
+module Caboose
+  class BillingAddressesController < Caboose::ApplicationController
+            
+    # GET /admin/orders/:order_id/billing-address/json
+    def admin_json
+      return if !user_is_allowed('orders', 'edit')    
+      order = Order.find(params[:order_id])      
+      render :json => order.billing_address      
+    end
+      
+    # PUT /admin/orders/:order_id/billing-address
+    def admin_update
+      return if !user_is_allowed('orders', 'edit')
+      
+      resp = Caboose::StdClass.new({'attributes' => {}})
+      order = Order.find(params[:order_id])    
+      sa = order.billing_address
+      
+      if sa.nil?
+        sa = Address.create
+        order.billing_address_id = sa.id
+        order.save
+      end
+      
+      save = true    
+      params.each do |name, value|
+        case name          
+          when 'name'           then sa.name          = value          
+          when 'first_name'     then sa.first_name    = value
+          when 'last_name'      then sa.last_name     = value
+          when 'street'         then sa.street        = value
+          when 'address1'       then sa.address1      = value
+          when 'address2'       then sa.address2      = value
+          when 'company'        then sa.company       = value
+          when 'city'           then sa.city          = value
+          when 'state'          then sa.state         = value
+          when 'province'       then sa.province      = value
+          when 'province_code'  then sa.province_code = value
+          when 'zip'            then sa.zip           = value
+          when 'country'        then sa.country       = value
+          when 'country_code'   then sa.country_code  = value
+          when 'phone'          then sa.phone         = value
+        end
+      end
+      resp.success = save && sa.save      
+      render :json => resp
+    end
+        
+  end
+end

data/app/controllers/caboose/line_items_controller.rb

@@ -118,15 +118,18 @@ module Caboose
     # GET /admin/line-items/product-stubs
     def admin_product_stubs      
       title = params[:title].strip.downcase.split(' ')
-      render :json => [] and return if title.length == 0      
-      where = ["site_id = ?"]
-      query = [@site.id]
+      render :json => [] and return if title.length == 0
+      
+      where = ["site_id = ?"]      
+      vars = [@site.id]
       title.each do |str|
         where << 'lower(title) like ?'
-        query << "%#{str}%"
-      end
+        vars << "%#{str}%"
+      end      
       where = where.join(' and ')
-      query[0] = "select id, title from store_products where #{where} order by title limit 20"          
+      query = ["select id, title from store_products where #{where} order by title limit 20"]
+      vars.each{ |v| query << v }
+      
       rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, query))
       arr = rows.collect{ |row| { :id => row[0], :title => row[1] }}
       render :json => arr

data/app/controllers/caboose/shipping_addresses_controller.rb

@@ -15,7 +15,7 @@ module Caboose
       resp = Caboose::StdClass.new({'attributes' => {}})
       order = Order.find(params[:order_id])    
       sa = order.shipping_address
-      Caboose.log(sa.first_name)
+      
       save = true    
       params.each do |name, value|
         case name          
@@ -35,10 +35,8 @@ module Caboose
           when 'country_code'   then sa.country_code  = value
           when 'phone'          then sa.phone         = value
         end
-      end          
-      Caboose.log(sa.first_name)
-      resp.success = save && sa.save
-      Caboose.log(sa.first_name)
+      end                
+      resp.success = save && sa.save      
       render :json => resp
     end
         

data/app/views/caboose/orders/admin_edit.html.erb

@@ -43,7 +43,8 @@ $(document).ready(function() {
 <% content_for :caboose_css do %>
 <style type='text/css'>
 
-table.shipping_address td { 
+table.shipping_address td,
+table.billing_address td {
   padding: 0 !important; 
   margin: 0 !important; 
   border: 0 !important; 

data/config/routes.rb

@@ -532,6 +532,8 @@ Caboose::Engine.routes.draw do
   put     "/admin/orders/:order_id/line-items/:id"    => "line_items#admin_update"
   delete  "/admin/orders/:order_id/line-items/:id"    => "line_items#admin_delete"
   
+  get     "admin/orders/:order_id/billing-address/json"   => "billing_addresses#admin_json"      
+  put     "admin/orders/:order_id/billing-address"        => "billing_addresses#admin_update"
   get     "admin/orders/:order_id/shipping-address/json"  => "shipping_addresses#admin_json"      
   put     "admin/orders/:order_id/shipping-address"       => "shipping_addresses#admin_update"    
   

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.145'
+  VERSION = '0.5.146'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.145
+  version: 0.5.146
 platform: ruby
 authors:
 - William Barry
@@ -510,6 +510,7 @@ files:
 - app/controllers/caboose/ab_variants_controller.rb
 - app/controllers/caboose/admin_controller.rb
 - app/controllers/caboose/application_controller.rb
+- app/controllers/caboose/billing_addresses_controller.rb
 - app/controllers/caboose/block_type_categories_controller.rb
 - app/controllers/caboose/block_type_sources_controller.rb
 - app/controllers/caboose/block_type_store_controller.rb