caboose-cms 0.5.69 → 0.5.70

data/app/assets/stylesheets/caboose/checkout.css.scss

@@ -390,6 +390,7 @@
 }
 
 #checkout-confirm {
+  margin-top: 10px;
   width: 100%;
   #line-items { width: 100%; margin: 0 auto; 
     table {

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

@@ -1,5 +1,5 @@
 <div class="wrapper">
-  <form  action="/checkout/address" method="put">
+  <form action="/checkout/addresses" method="put">
     <section>
       <fieldset id="shipping">
         <h3>Shipping Address</h3>

data/app/controllers/caboose/cart_controller.rb

@@ -7,14 +7,29 @@ module Caboose
     
     # GET /cart/items
     def list
-      render :json => @order.as_json(:include => [        
-        { :line_items => { :include => { :variant => { :include => :product }}}},
-        { :order_packages => { :include => [:shipping_package, :shipping_method] }},
-        :customer,
-        :shipping_address,
-        :billing_address,
-        :order_transactions
-      ])
+      render :json => @order.as_json(
+        :include => [        
+          { 
+            :line_items => { 
+              :include => { 
+                :variant => { 
+                  :include => [
+                    { :product_images => { :methods => :urls }},
+                    { :product => { :include => { :product_images => { :methods => :urls }}}}
+                  ],
+                  :methods => :title
+                }
+              }
+            }
+          },
+          { :order_packages => { :include => [:shipping_package, :shipping_method] }},
+          :customer,
+          :shipping_address,
+          :billing_address,
+          :order_transactions,
+          { :discounts => { :include => :gift_card }}
+        ]        
+      )
     end
     
     # GET /cart/item-count
@@ -60,6 +75,43 @@ module Caboose
       li = LineItem.find(params[:line_item_id]).destroy
       render :json => { :success => true, :item_count => @order.line_items.count }
     end
+    
+    # POST /cart/gift-cards
+    def add_gift_card      
+      resp = StdClass.new
+      code = params[:code].strip
+      gc = GiftCard.where("lower(code) = ?", code.downcase).first
+      
+      if gc.nil? then resp.error = "Invalid gift card code."                    
+      elsif gc.status != GiftCard::STATUS_ACTIVE                                then resp.error = "That gift card is not active."
+      elsif gc.date_available && DateTime.now.utc < self.date_available         then resp.error = "That gift card is not active yet."         
+      elsif gc.date_expires && DateTime.now.utc > self.date_expires             then resp.error = "That gift card is expired."
+      elsif gc.card_type == GiftCard::CARD_TYPE_AMOUNT && gc.balance <= 0       then resp.error = "That gift card has a zero balance." 
+      elsif gc.min_order_total && @order.total < gc.min_order_total             then resp.error = "Your order must be at least $#{sprintf('%.2f',gc.min_order_total)} to use this gift card." 
+      elsif Discount.where(:order_id => @order.id, :gift_card_id => gc.id).exists? then resp.error = "That gift card has already been applied to this order."
+      else
+        # Determine how much the discount will be
+        d = Discount.new(:order_id => @order.id, :gift_card_id => gc.id, :amount => 0.0)
+        case gc.card_type
+          when GiftCard::CARD_TYPE_AMOUNT      then d.amount = (@order.total > gc.balance ? gc.balance : @order.total)
+          when GiftCard::CARD_TYPE_PERCENTAGE  then d.amount = @order.subtotal * gc.total
+          when GiftCard::CARD_TYPE_NO_SHIPPING then d.amount = @order.shipping
+          when GiftCard::CARD_TYPE_NO_TAX      then d.amount = @order.tax
+        end
+        d.save
+        @order.calculate
+        resp.success = true
+        resp.order_total = @order.total
+      end
+      render :json => resp
+    end
+    
+    # DELETE /cart/discounts/:discount_id
+    def remove_discount
+      Discount.find(params[:discount_id]).destroy
+      @order.calculate
+      render :json => { :success => true }
+    end
   end
 end
 

data/app/controllers/caboose/checkout_controller.rb

@@ -10,52 +10,57 @@ module Caboose
       redirect_to '/checkout/empty' if @order.line_items.empty?
     end
     
+    # Step 1 - Login or register
     # GET /checkout
-    def index
-      redirect_to '/checkout/step-one'
-    end
-            
-    # GET /checkout/step-one
-    def step_one
+    def index        
       if logged_in?
         if @order.customer_id.nil?
           @order.customer_id = logged_in_user.id
           @order.save
         end
-        redirect_to '/checkout/step-two'
+        redirect_to '/checkout/addresses'
         return        
       end
     end
     
-    # GET /checkout/step-two
-    def step_two
-      #redirect_to '/checkout/step-one' if !@order.shipping_address || !@order.billing_address
-      redirect_to '/checkout/step-one' if !logged_in?      
+    # Step 2 - Shipping and billing addresses
+    # GET /checkout/addresses
+    def addresses      
+      redirect_to '/checkout' if !logged_in?      
     end
     
-    # GET /checkout/step-three
-    def step_three
-      redirect_to '/checkout/step-one' and return if !logged_in?
-      redirect_to '/checkout/step-two' and return if @order.shipping_address.nil? || @order.billing_address.nil?
-
+    # Step 3 - Shipping method
+    # GET /checkout/shipping
+    def shipping
+      redirect_to '/checkout'           and return if !logged_in?
+      redirect_to '/checkout/addresses' and return if @order.shipping_address.nil? || @order.billing_address.nil?
+                  
       # Remove any order packages      
       LineItem.where(:order_id => @order.id).update_all(:order_package_id => nil)
       OrderPackage.where(:order_id => @order.id).destroy_all      
-      
+        
       # Calculate what shipping packages we'll need            
       OrderPackage.create_for_order(@order)
       
-      # Now get the rates for those packages
-      Caboose.log("Getting rates...")      
+      # Now get the rates for those packages            
       @rates = ShippingCalculator.rates(@order)      
       Caboose.log(@rates.inspect)      
     end
     
-    # GET /checkout/step-four
-    def step_four
-      redirect_to '/checkout/step-one'   and return if !logged_in?
-      redirect_to '/checkout/step-two'   and return if @order.shipping_address.nil? || @order.billing_address.nil?
-      redirect_to '/checkout/step-three' and return if @order.shipping_service_code.nil?
+    # Step 4 - Gift cards
+    # GET /checkout/gift-cards
+    def gift_cards
+      redirect_to '/checkout'           and return if !logged_in?
+      redirect_to '/checkout/addresses' and return if @order.shipping_address.nil? || @order.billing_address.nil?
+      redirect_to '/checkout/shipping'  and return if @order.shipping_service_code.nil?
+    end
+    
+    # Step 5 - Payment
+    # GET /checkout/payment
+    def payment
+      redirect_to '/checkout'           and return if !logged_in?
+      redirect_to '/checkout/addresses' and return if @order.shipping_address.nil? || @order.billing_address.nil?
+      redirect_to '/checkout/shipping'  and return if @order.shipping_service_code.nil?      
       
       # Make sure all the variants still exist      
       @order.line_items.each do |li|
@@ -103,8 +108,8 @@ module Caboose
       }
     end
     
-    # PUT /checkout/address
-    def update_address
+    # PUT /checkout/addresses
+    def update_addresses
       
       # Grab or create addresses
       shipping_address = if @order.shipping_address then @order.shipping_address else Address.new end
@@ -177,7 +182,7 @@ module Caboose
           resp.errors = @order.errors.full_messages
         else
           @order.save
-          resp.redirect = '/checkout/step-two'
+          resp.redirect = '/checkout/addresses'
         end
       end
       render :json => resp            
@@ -190,29 +195,13 @@ module Caboose
     
     # PUT /checkout/shipping
     def update_shipping
-
-      rates = ShippingCalculator.rates(@order)
-        
-      if @site.store_config.calculate_packages
-        # TODO: Add the separate shipping costs for each package
-      else
-        @order.shipping_carrier      = params[:carrier]
-        @order.shipping_service_code = params[:service_code]
-        @order.shipping_service_name = params[:service_name]
-        
-        rates[0][:rates].each do |rate|
-          if rate[:carrier] == params[:carrier] && rate[:service_code] == params[:service_code]
-            @order.shipping = rate[:total_price]
-            break
-          end
-        end                 
-      end                       
-      render :json => { 
-        :success => @order.save, 
-        :errors => @order.errors.full_messages 
-        #:order => @order, 
-        #:selected_rate => ShippingCalculator.rate(@order) 
-      }
+      op = OrderPackage.find(params[:order_package_id])
+      op.shipping_method_id = params[:shipping_method_id]
+      op.total = params[:total]
+      op.save
+      op.order.calculate
+                                   
+      render :json => { :success => true }               
     end
     
     # GET /checkout/payment
@@ -254,6 +243,9 @@ module Caboose
       if ot.success
         order.financial_status = 'authorized'
         order.status = 'pending'
+         
+        # Take funds from any gift cards that were used on the order
+        order.take_gift_card_funds
         
         # Send out emails        
         OrdersMailer.configure_for_site(@site.id).customer_new_order(order).deliver
@@ -291,27 +283,6 @@ module Caboose
       render :layout => false
     end
     
-    # GET /checkout/discount
-    #def discount
-    #  # TODO make it possible to use multiple discounts
-    #  
-    #  @gift_card = @order.discounts.first
-    #end
-    
-    # POST /checkout/update-discount
-    #def add_discount
-    #  gift_card = Discount.find_by_code(params[:gift_card_number])
-    #  
-    #  render :json => { :error => true, :message => 'Gift card not found.' } and return if gift_card.nil?
-    #  render :json => { :error => true, :message => 'Gift card has no remaining funds.' } and return if gift_card.amount_current <= 0
-    #  
-    #  @order.discounts.delete_all if @order.discounts.any?
-    #  @order.discounts << gift_card
-    #  @order.calculate_total
-    #  
-    #  render :json => { :success => true, :message => 'Gift card added successfully.' }
-    #end
-    
     #def relay
     #  
     #  # Check to see that the order has a valid total and was authorized

data/app/controllers/caboose/gift_cards_controller.rb

@@ -0,0 +1,216 @@
+module Caboose
+  class GiftCardsController < Caboose::ApplicationController
+    
+    # GET /admin/gift-cards
+    def admin_index
+      return if !user_is_allowed('giftcards', 'view')      
+      render :layout => 'caboose/admin'
+    end
+    
+    # GET /admin/gift-cards/json
+    def admin_json
+      return if !user_is_allowed('giftcards', 'view')
+      
+      pager = PageBarGenerator.new(params, {
+          'site_id'             => @site.id,          
+          'name'                => '',
+          'code'                => '',      
+          'card_type'           => '',
+          'total_lte'           => '',
+          'total_gte'           => '',
+          'balance_lte'         => '',
+          'balance_gte'         => '',
+          'min_order_total_lte' => '',
+          'min_order_total_gte' => '',
+          'date_available_lte'  => '',
+          'date_available_gte'  => '',
+          'date_expires_lte'    => '',
+          'date_expires_gte'    => '',
+          'status'              => ''
+    		},{
+    		  'model'          => 'Caboose::GiftCard',
+    	    'sort'			     => 'code',
+    		  'desc'			     => false,
+    		  'base_url'		   => "/admin/gift-cards",
+    		  'use_url_params' => false
+    	})
+    	render :json => {
+    	  :pages => pager,
+    	  :models => pager.items
+    	}
+    end
+    
+    # GET /admin/gift-cards/:id/json
+    def admin_json_single
+      return if !user_is_allowed('giftcards', 'view')    
+      gc = GiftCard.find(params[:id])      
+      render :json => gc
+    end
+    
+    # GET /admin/gift-cards/new
+    def admin_new
+      return if !user_is_allowed('giftcards', 'add')      
+      render :layout => 'caboose/admin'
+    end
+    
+    # POST /admin/gift-cards
+    def admin_add
+      return if !user_is_allowed('giftcards', 'add')
+      
+      resp = StdClass.new
+      code = params[:code].strip
+      
+      if code.length == 0
+        resp.error = "A valid code is required."
+      elsif GiftCard.where(:code => code).exists?
+        resp.error = "A gift card with that code already exists."
+      else
+        gc = GiftCard.new(
+          :site_id => @site.id,
+          :code    => code,
+          :status  => GiftCard::STATUS_INACTIVE              
+        )
+        resp.success = gc.save
+        resp.new_id = gc.id
+        resp.redirect = "/admin/gift-cards/#{gc.id}"
+      end
+      
+      render :json => resp        
+    end
+    
+    # POST /admin/gift-cards/bulk
+    def admin_bulk_add
+      return if !user_is_allowed('sites', 'add')
+      
+      resp = Caboose::StdClass.new
+      i = 0
+      CSV.parse(params[:csv_data].strip).each do |row|        
+        if row[0].nil? || row[0].strip.length == 0        
+          resp.error = "Code not defined on row #{i+1}."        
+        end
+        i = i + 1
+      end
+      
+      if resp.error.nil?
+        CSV.parse(params[:csv_data]).each do |row|
+          Caboose::GiftCard.create(
+            :site_id  => @site.id,
+            :code => row[0].strip,            
+            :status => GiftCard::STATUS_INACTIVE                        
+          )
+        end
+        resp.success = true
+      end
+      
+      render :json => resp
+    end
+  
+    # GET /admin/gift-cards/:id
+    def admin_edit
+      return if !user_is_allowed('giftcards', 'edit')
+      @gift_card = GiftCard.find(params[:id])
+      render :layout => 'caboose/admin'
+    end
+
+    # PUT /admin/gift-cards/:id
+    def admin_update
+      return if !user_is_allowed('giftcards', 'edit')
+      
+      resp = Caboose::StdClass.new
+      gc = GiftCard.find(params[:id])    
+      
+      save = true    
+      params.each do |name,value|
+        case name
+          when 'site_id'         then gc.site_id         = value                 
+          when 'name'            then gc.name            = value
+          when 'code'            then gc.code            = value
+          when 'card_type'       then gc.card_type       = value
+          when 'total'           then gc.total           = value
+          when 'balance'         then gc.balance         = value
+          when 'min_order_total' then gc.min_order_total = value
+          when 'date_available'  then gc.date_available  = DateTime.strptime(value, '%m/%d/%Y')
+          when 'date_expires'    then gc.date_expires    = DateTime.strptime(value, '%m/%d/%Y')
+          when 'status'          then gc.status          = value                            
+        end
+      end          
+      resp.success = save && gc.save
+      render :json => resp
+    end
+    
+    # PUT /admin/gift-cards/bulk
+    def admin_bulk_update
+      return unless user_is_allowed_to 'edit', 'sites'
+    
+      resp = Caboose::StdClass.new    
+      gift_cards = params[:model_ids].collect{ |gc_id| GiftCard.find(gc_id) }
+    
+      save = true
+      params.each do |k,v|
+        case k
+          when 'site_id'         then gift_cards.each{ |gc| gc.site_id         = v }                 
+          when 'name'            then gift_cards.each{ |gc| gc.name            = v }
+          when 'code'            then gift_cards.each{ |gc| gc.code            = v }
+          when 'card_type'       then gift_cards.each{ |gc| gc.card_type       = v }
+          when 'total'           then gift_cards.each{ |gc| gc.total           = v }
+          when 'balance'         then gift_cards.each{ |gc| gc.balance         = v }
+          when 'min_order_total' then gift_cards.each{ |gc| gc.min_order_total = v }            
+          when 'date_available'  then gift_cards.each{ |gc| gc.date_available  = DateTime.strptime(v, '%m/%d/%Y') }
+          when 'date_expires'    then gift_cards.each{ |gc| gc.date_expires    = DateTime.strptime(v, '%m/%d/%Y') }
+          when 'status'          then gift_cards.each{ |gc| gc.status          = v }                      
+        end        
+      end
+      gift_cards.each{ |gc| gc.save }
+    
+      resp.success = true
+      render :json => resp
+    end
+    
+    # DELETE /admin/gift-cards/:id
+    def admin_delete
+      return if !user_is_allowed('giftcards', 'delete')
+      GiftCard.find(params[:id]).destroy
+      render :json => Caboose::StdClass.new({
+        :redirect => '/admin/gift-cards'
+      })
+    end
+    
+    # DELETE /admin/gift-cards/:id/bulk    
+    def admin_bulk_delete
+      return if !user_is_allowed('sites', 'delete')
+      
+      resp = Caboose::StdClass.new
+      params[:model_ids].each do |gc_id|
+        GiftCard.find(gc_id).destroy
+      end
+      resp.success = true
+      render :json => resp
+    end
+        
+    # GET /admin/gift-cards/status-options
+    def admin_status_options
+      return if !user_is_allowed('categories', 'view')
+      statuses = [      
+        GiftCard::STATUS_INACTIVE,
+        GiftCard::STATUS_ACTIVE,
+        GiftCard::STATUS_EXPIRED
+      ]        
+      options = statuses.collect{ |s| { 'text' => s, 'value' => s }}       
+      render :json => options
+    end
+    
+    # GET /admin/gift-cards/card-type-options
+    def admin_card_type_options
+      return if !user_is_allowed('categories', 'view')
+      types = [
+        GiftCard::CARD_TYPE_AMOUNT,
+        GiftCard::CARD_TYPE_PERCENTAGE,
+        GiftCard::CARD_TYPE_NO_SHIPPING,
+        GiftCard::CARD_TYPE_NO_TAX,
+      ]        
+      options = types.collect{ |s| { 'text' => s, 'value' => s }}       
+      render :json => options            
+    end
+    
+  end
+end