caboose-cms 0.5.122 → 0.5.123

data/app/assets/templates/caboose/cart/line_items.jst.ejs

@@ -26,7 +26,7 @@
         </section>
         
         <section>
-          <p class="price">$<%= parseFloat(Math.round(lineItem.price * 100) / 100).toFixed(2)  %></p>
+          <p class="price">$<%= parseFloat(Math.round(lineItem.subtotal * 100) / 100).toFixed(2)  %></p>
         </section>
       </li>
     <% }); %>

data/app/assets/templates/caboose/checkout/line_items.jst.ejs

@@ -6,10 +6,10 @@
       <div class="wrapper">
         <aside>
           <figure style="background-image: url(<%= lineItem.variant.images[0].urls.thumb %>)"></figure>
-          <p><%= lineItem.title %><br />Qty: <%= lineItem.quantity %><br /><span class="price">$<%= ((parseFloat(lineItem.price) * 100) / 100).toFixed(2) %></span></p>
+          <p><%= lineItem.title %><br />Qty: <%= lineItem.quantity %><br /><span class="price">$<%= ((parseFloat(lineItem.unit_price) * 100) / 100).toFixed(2) %></span></p>
         </aside>        
         <section>
-          <p>$<%= ((parseFloat(lineItem.price) * 100) / 100).toFixed(2) %></p>
+          <p>$<%= ((parseFloat(lineItem.subtotal) * 100) / 100).toFixed(2) %></p>
         </section>
       </div>
     </li>

data/app/controllers/caboose/checkout_controller.rb

@@ -257,8 +257,9 @@ module Caboose
       
       error = nil
       if ot.success
-        order.financial_status = 'authorized'
-        order.status = 'pending'
+        order.financial_status = Order::FINANCIAL_STATUS_AUTHORIZED
+        order.status = Order::STATUS_PENDING
+        order.order_number = @site.store_config.next_order_number
          
         # Take funds from any gift cards that were used on the order
         order.take_gift_card_funds

data/app/controllers/caboose/line_items_controller.rb

@@ -24,7 +24,8 @@ module Caboose
         :order_id   => params[:order_id],
         :variant_id => params[:variant_id],
         :quantity   => 1,
-        :price      => v.price,
+        :unit_price => v.price,
+        :subtotal   => v.price,
         :status     => 'pending'                
       )         
       resp.success = li.save
@@ -46,7 +47,8 @@ module Caboose
           when 'order_package_id' then li.order_package_id  = value
           when 'variant_id'       then li.variant_id        = value
           when 'parent_id'        then li.parent_id         = value          
-          when 'price'            then li.price             = value
+          when 'unit_price'       then li.unit_price        = value
+          when 'subtotal'         then li.subtotal          = value
           when 'notes'            then li.notes             = value
           when 'custom1'          then li.custom1           = value
           when 'custom2'          then li.custom2           = value

data/app/controllers/caboose/my_account_controller.rb

@@ -0,0 +1,43 @@
+module Caboose
+  class MyAccountController < Caboose::ApplicationController
+            
+    # GET /my-account
+    def index
+      return if !verify_logged_in
+      @user = logged_in_user      
+    end
+    
+    # PUT /my-account
+    def update  
+      return if !logged_in?
+      
+      resp = StdClass.new     
+      user = logged_in_user
+    
+      save = true
+      params.each do |name,value|
+        case name
+    	  	when "first_name" then user.first_name  = value
+    	  	when "last_name"  then user.last_name   = value
+    	  	when "username"   then user.username    = value
+    	  	when "email"      then user.email       = value
+    	  	when "phone"      then user.phone       = value
+    	  	when "password"			  
+    	  	  confirm = params[:confirm]
+    	  		if value != confirm			
+    	  		  resp.error = "Passwords do not match.";
+    	  		  save = false
+    	  		elsif value.length < 8
+    	  		  resp.error = "Passwords must be at least 8 characters.";
+    	  		  save = false
+    	  		else
+    	  		  user.password = Digest::SHA1.hexdigest(Caboose::salt + value)
+    	  		end    	  	    		  
+    	  end
+    	end
+    	
+    	resp.success = save && user.save
+    	render :json => resp
+    end        
+  end
+end

data/app/controllers/caboose/my_account_orders_controller.rb

@@ -6,17 +6,16 @@ module Caboose
       return if !logged_in?
       
       @pager = Caboose::PageBarGenerator.new(params, {
-        'customer_id'          => @logged_in_user_id.id,         
-        'status'               => '',        
-        'id'                   => ''
+        'customer_id'          => logged_in_user.id,         
+        'status'               => [Order::STATUS_PENDING, Order::STATUS_CANCELED, Order::STATUS_SHIPPED]
       }, {
         'model'          => 'Caboose::Order',
-        'sort'           => 'id',
+        'sort'           => 'order_number',
         'desc'           => 1,
         'base_url'       => '/my-account/orders',
         'use_url_params' => false
       })      
-      @orders = @pager.items                  
+      @orders = @pager.all_items
     end
       
     # GET /my-account/orders/:id
@@ -30,6 +29,41 @@ module Caboose
         return
       end      
     end
-             
+     # GET /my-account
+    def my_account
+      return if !logged_in?
+      @user = logged_in_user
+      render :layout => 'caboose/modal'
+    end
+    
+    # PUT /my-account
+    def update_my_account  
+      return if !logged_in?
+      
+      resp = StdClass.new     
+      user = logged_in_user
+    
+      save = true
+      params.each do |name,value|
+        case name
+    	  	when "first_name", "last_name", "username", "email", "phone"
+    	  	  user[name.to_sym] = value
+    	  	when "password"			  
+    	  	  confirm = params[:confirm]
+    	  		if (value != confirm)			
+    	  		  resp.error = "Passwords do not match.";
+    	  		  save = false
+    	  		elsif (value.length < 8)
+    	  		  resp.error = "Passwords must be at least 8 characters.";
+    	  		  save = false
+    	  		else
+    	  		  user.password = Digest::SHA1.hexdigest(Caboose::salt + value)
+    	  		end    	  	    		  
+    	  end
+    	end
+    	
+    	resp.success = save && user.save
+    	render json: resp
+    end        
   end
 end

data/app/controllers/caboose/orders_controller.rb

@@ -16,7 +16,7 @@ module Caboose
       @pager = Caboose::PageBarGenerator.new(params, {
         'site_id'              => @site.id,
         'customer_id'          => '', 
-        'status'               => 'pending',
+        'status'               => Order::STATUS_PENDING,
         'shipping_method_code' => '',
         'id'                   => ''
       }, {
@@ -43,8 +43,8 @@ module Caboose
     def admin_add
       return if !user_is_allowed('orders', 'add')
       order = Order.create(
-        :status => 'pending',                          
-        :financial_status => 'pending'
+        :status => Order::STATUS_PENDING,                          
+        :financial_status => Order::FINANCIAL_STATUS_PENDING
       )    
       render :json => { :sucess => true, :redirect => "/admin/orders/#{order.id}" }
     end
@@ -64,7 +64,7 @@ module Caboose
       order = Order.find(params[:id])
       t = OrderTransaction.where(:order_id => order.id, :transaction_type => OrderTransaction::TYPE_AUTHORIZE, :success => true).first
       
-      if order.financial_status == 'captured'
+      if order.financial_status == Order::FINANCIAL_STATUS_CAPTURED
         resp.error = "This order has already been captured, you will need to refund instead"
       elsif t.nil?
         resp.error = "This order doesn't seem to be authorized."
@@ -78,12 +78,12 @@ module Caboose
               sc.pp_username, 
               sc.pp_password,                      
               order.total,
-              :transaction_type => 'VOID',
+              :transaction_type => OrderTransaction::TYPE_VOID,
               :transaction_id => t.transaction_id
             )                    
             order.update_attributes(
-              :financial_status => 'voided',
-              :status => 'cancelled'
+              :financial_status => Order::FINANCIAL_STATUS_VOIDED,
+              :status => Order::STATUS_CANCELED
             )
             order.save          
             # TODO: Add the variant quantities ordered back        
@@ -109,13 +109,13 @@ module Caboose
     
       order = Order.find(params[:id])
     
-      if order.financial_status != 'captured'
+      if order.financial_status != Order::FINANCIAL_STATUS_CAPTURED
         response.error = "This order hasn't been captured yet, you will need to void instead"
       else
         if PaymentProcessor.refund(order)
           order.update_attributes(
-            :financial_status => 'refunded',
-            :status => 'cancelled'
+            :financial_status => Order::FINANCIAL_STATUS_REFUNDED,
+            :status => Order::STATUS_CANCELED
           )
           
           response.success = 'Order refunded successfully'
@@ -214,7 +214,7 @@ module Caboose
       return if !user_is_allowed('orders', 'edit')    
       
       pdf = PendingOrdersPdf.new
-      pdf.orders = Order.where(:status => 'pending').all      
+      pdf.orders = Order.where(:status => Order::STATUS_PENDING).all      
       send_data pdf.to_pdf, :filename => "pending_orders.pdf", :type => "application/pdf", :disposition => "inline"            
     end
       
@@ -258,7 +258,7 @@ module Caboose
       order = Order.find(params[:id])
       t = OrderTransaction.where(:order_id => order.id, :transaction_type => OrderTransaction::TYPE_AUTHORIZE, :success => true).first
       
-      if order.financial_status == 'captured'
+      if order.financial_status == Order::FINANCIAL_STATUS_CAPTURED
         resp.error = "Funds for this order have already been captured."    
       elsif order.total > order.auth_amount
         resp.error = "The order total exceeds the authorized amount."
@@ -277,7 +277,7 @@ module Caboose
               :transaction_type => 'CAPTURE_ONLY',
               :transaction_id => t.transaction_id
             )                
-            order.update_attribute(:financial_status, 'captured')
+            order.update_attribute(:financial_status, Order::FINANCIAL_STATUS_CAPTURED)
             resp.success = 'Captured funds successfully'
           when 'payscape'
             # TODO: Implement capture funds for payscape
@@ -372,9 +372,15 @@ module Caboose
 
     # GET /admin/orders/status-options
     def admin_status_options
-      return if !user_is_allowed('categories', 'view')
-      statuses = ['cart', 'pending', 'ready to ship', 'shipped', 'canceled']
-      options = statuses.collect{ |s| { 'text' => s, 'value' => s }}       
+      return if !user_is_allowed('orders', 'view')
+      statuses = [
+        Order::STATUS_CART, 
+        Order::STATUS_PENDING, 
+        Order::STATUS_READY_TO_SHIP, 
+        Order::STATUS_SHIPPED, 
+        Order::STATUS_CANCELED
+      ]
+      options = statuses.collect{ |s| { 'text' => s.capitalize, 'value' => s }}       
       render :json => options    
     end
     
@@ -397,16 +403,16 @@ module Caboose
       if Caboose::Setting.exists?(:name => 'google_feed_date_last_submitted')                  
         d1 = Caboose::Setting.where(:name => 'google_feed_date_last_submitted').first.value      
         d1 = DateTime.parse(d1)
-      elsif Order.exists?("status = 'shipped' and date_authorized is not null")
-        d1 = Order.where("status = ? and date_authorized is not null", 'shipped').reorder("date_authorized DESC").limit(1).pluck('date_authorized')
+      elsif Order.exists?("status = ? and date_authorized is not null", Order::STATUS_SHIPPED)
+        d1 = Order.where("status = ? and date_authorized is not null", Order::STATUS_SHIPPED).reorder("date_authorized DESC").limit(1).pluck('date_authorized')
         d1 = DateTime.parse(d1)
       end
       
       # Google Feed Docs
       # https://support.google.com/trustedstoresmerchant/answer/3272612?hl=en&ref_topic=3272286?hl=en
       tsv = ["merchant order id\ttracking number\tcarrier code\tother carrier name\tship date"]            
-      if Order.exists?("status = 'shipped' and date_authorized > '#{d1.strftime("%F %T")}'")
-        Order.where("status = ? and date_authorized > ?", 'shipped', d1).reorder(:id).all.each do |order|
+      if Order.exists?("status = ? and date_authorized > '#{d1.strftime("%F %T")}'", Order::STATUS_SHIPPED)
+        Order.where("status = ? and date_authorized > ?", Order::STATUS_SHIPPED, d1).reorder(:id).all.each do |order|
           tracking_numbers = order.line_items.collect{ |li| li.tracking_number }.compact.uniq
           tn = tracking_numbers && tracking_numbers.count >= 1 ? tracking_numbers[0] : ""
           tsv << "#{order.id}\t#{tn}\tUPS\t\t#{order.date_shipped.strftime("%F")}"                              

data/app/controllers/caboose/products_controller.rb

@@ -47,6 +47,7 @@ module Caboose
       # Otherwise looking at a category or search parameters
       @pager = Caboose::Pager.new(params, {
         'site_id'        => @site.id,
+        'on_sale'        => '',
         'category_id'    => '',
         'vendor_id'      => '',
         'vendor_name'    => '',

data/app/controllers/caboose/sites_controller.rb

@@ -87,7 +87,21 @@ module Caboose
     	
     	resp.success = save && site.save
     	render :json => resp
-    end        
+    end
+    
+    # POST /admin/sites/:id/logo
+    def admin_update_logo
+      return if !user_is_allowed('sites', 'edit')
+      
+      site = Site.find(params[:id])       
+      site.logo = params[:logo]
+      site.save
+      
+      resp = StdClass.new
+      resp.success = true
+      resp.attributes = { :image => { :value => site.logo.url(:thumb) }}
+      render :json => resp
+    end
       
     # DELETE /admin/sites/:id
     def admin_delete

data/app/controllers/caboose/users_controller.rb

@@ -12,42 +12,7 @@ module Caboose
     # Non-admin actions
     #===========================================================================
     
-    # GET /my-account
-    def my_account
-      return if !logged_in?
-      @user = logged_in_user
-      render :layout => 'caboose/modal'
-    end
-    
-    # PUT /my-account
-    def update_my_account  
-      return if !logged_in?
-      
-      resp = StdClass.new     
-      user = logged_in_user
     
-      save = true
-      params.each do |name,value|
-        case name
-    	  	when "first_name", "last_name", "username", "email", "phone"
-    	  	  user[name.to_sym] = value
-    	  	when "password"			  
-    	  	  confirm = params[:confirm]
-    	  		if (value != confirm)			
-    	  		  resp.error = "Passwords do not match.";
-    	  		  save = false
-    	  		elsif (value.length < 8)
-    	  		  resp.error = "Passwords must be at least 8 characters.";
-    	  		  save = false
-    	  		else
-    	  		  user.password = Digest::SHA1.hexdigest(Caboose::salt + value)
-    	  		end    	  	    		  
-    	  end
-    	end
-    	
-    	resp.success = save && user.save
-    	render json: resp
-    end
   
     #===========================================================================
     # Admin actions

data/app/controllers/caboose/variants_controller.rb

@@ -119,7 +119,7 @@ module Caboose
           when 'alternate_id'       then v.alternate_id       = value
           when 'sku'                then v.sku                = value
           when 'barcode'            then v.barcode            = value
-          when 'price'              then v.price              = value
+          when 'price'              then v.price              = value                      
           when 'quantity_in_stock'  then v.quantity_in_stock  = value
           when 'ignore_quantity'    then v.ignore_quantity    = value
           when 'allow_backorder'    then v.allow_backorder    = value
@@ -135,6 +135,16 @@ module Caboose
           when 'taxable'            then v.taxable            = value
           when 'downloadable'       then v.downloadable       = value
           when 'download_path'      then v.download_path      = value
+            
+          when 'sale_price'
+            v.sale_price = value            
+            v.product.delay(:run_at => 3.seconds.from_now).update_on_sale            
+          when 'date_sale_starts'
+            v.date_sale_starts = ModelBinder.local_datetime_to_utc(value, @logged_in_user.timezone)                        
+            v.product.delay(:run_at => v.date_sale_starts).update_on_sale                                  
+          when 'date_sale_ends'
+            v.date_sale_ends = ModelBinder.local_datetime_to_utc(value, @logged_in_user.timezone)                        
+            v.product.delay(:run_at => v.date_sale_ends).update_on_sale                                  
         end
       end
       resp.success = save && v.save
@@ -380,7 +390,7 @@ module Caboose
       return unless user_is_allowed_to 'edit', 'sites'
     
       resp = Caboose::StdClass.new    
-      variants = params[:model_ids].collect{ |variant_id| Variant.find(variant_id) }
+      variants = params[:model_ids].collect{ |variant_id| Variant.find(variant_id) }      
     
       save = true
       params.each do |k,value|
@@ -404,6 +414,45 @@ module Caboose
           when 'taxable'            then variants.each { |v| v.taxable            = value }
           when 'downloadable'       then variants.each { |v| v.downloadable       = value }
           when 'download_path'      then variants.each { |v| v.download_path      = value }
+
+          when 'sale_price'
+            variants.each_with_index do |v, i|              
+              v.sale_price = value            
+              v.product.delay(:run_at => 3.seconds.from_now).update_on_sale if i == 0
+            end
+          when 'date_sale_starts'
+            variants.each_with_index do |v, i|
+              v.date_sale_starts = ModelBinder.update_date(v.date_sale_starts, value, @logged_in_user.timezone)
+              if i == 0
+                v.product.delay(:run_at => v.date_sale_starts).update_on_sale
+                v.product.delay(:run_at => 3.seconds.from_now).update_on_sale                
+              end                                
+            end
+          when 'time_sale_starts'
+            variants.each_with_index do |v, i|
+              v.date_sale_starts = ModelBinder.update_time(v.date_sale_starts, value, @logged_in_user.timezone)                                    
+              if i == 0
+                v.product.delay(:run_at => v.date_sale_starts).update_on_sale
+                v.product.delay(:run_at => 3.seconds.from_now).update_on_sale                
+              end
+            end            
+          when 'date_sale_ends'
+            variants.each_with_index do |v, i|
+              v.date_sale_ends = ModelBinder.update_date(v.date_sale_ends, value, @logged_in_user.timezone)            
+              if i == 0
+                v.product.delay(:run_at => v.date_sale_ends).update_on_sale
+                v.product.delay(:run_at => 3.seconds.from_now).update_on_sale                
+              end
+            end            
+          when 'time_sale_ends'
+            variants.each_with_index do |v, i|
+              v.date_sale_ends = ModelBinder.update_time(v.date_sale_ends, value, @logged_in_user.timezone)                                    
+              if i == 0
+                v.product.delay(:run_at => v.date_sale_ends).update_on_sale
+                v.product.delay(:run_at => 3.seconds.from_now).update_on_sale                
+              end
+            end
+            
         end        
       end
       variants.each{ |v| v.save }

data/app/controllers/caboose/vendors_controller.rb

@@ -46,7 +46,7 @@ module Caboose
       render :json => { :success => vendor.save }
     end
     
-    # POST /admin/vendors/:id/update/image
+    # POST /admin/vendors/:id/image
     def admin_update_image
       return if !user_is_allowed('vendors', 'edit')
       
@@ -55,8 +55,9 @@ module Caboose
       vendor.save
       
       resp = StdClass.new
+      resp.success = true
       resp.attributes = { :image => { :value => vendor.image.url(:thumb) }}
-      resp.success = vendor.save            
+      render :json => resp            
     end
     
     # GET /admin/vendors/new