caboose-cms 0.5.64 → 0.5.66

data/app/controllers/caboose/line_items_controller.rb

@@ -0,0 +1,135 @@
+module Caboose
+  class LineItemsController < Caboose::ApplicationController
+    
+    # GET /admin/orders/:id/line-items/json
+    def admin_json
+      return if !user_is_allowed('orders', 'edit')    
+      order = Order.find(params[:id])
+      render :json => order.line_items.as_json(:include => :order_package)
+    end
+    
+    # GET /admin/orders/:order_id/line-items/new
+    def admin_new
+      return if !user_is_allowed('orders', 'edit')      
+      render :layout => 'caboose/modal'            
+    end
+    
+    # POST /admin/orders/:order_id/line-items
+    def admin_add
+      return if !user_is_allowed('orders', 'edit')      
+      
+      resp = StdClass.new
+      v = Variant.find(params[:variant_id])
+      li = LineItem.new(
+        :order_id   => params[:order_id],
+        :variant_id => params[:variant_id],
+        :quantity   => 1,
+        :price      => v.price,
+        :status     => 'pending'                
+      )         
+      resp.success = li.save
+      render :json => resp
+    end
+      
+    # PUT /admin/orders/:order_id/line-items/:id
+    def admin_update
+      return if !user_is_allowed('orders', 'edit')
+      
+      resp = Caboose::StdClass.new({'attributes' => {}})
+      li = LineItem.find(params[:id])    
+      
+      save = true
+      send_status_email = false
+      params.each do |name,value|        
+        case name
+          when 'order_id'         then li.order_id          = value
+          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 'notes'            then li.notes             = value
+          when 'custom1'          then li.custom1           = value
+          when 'custom2'          then li.custom2           = value
+          when 'custom3'          then li.custom3           = value
+          when 'quantity'
+            li.quantity = value
+            li.save
+                      	  
+            # Recalculate everything
+            r = ShippingCalculator.rate(li.order, li.order.shipping_method_code)
+            li.order.shipping = r['negotiated_rate'] / 100
+            li.order.handling = (r['negotiated_rate'] / 100) * 0.05
+            tax_rate = TaxCalculator.tax_rate(li.order.shipping_address)
+            li.order.tax = li.order.subtotal * tax_rate
+            li.order.calculate_total
+            li.order.save
+            
+          when 'tracking_number'
+            li.tracking_number = value
+            send_status_email = true
+          when 'status'
+            li.status = value
+            resp.attributes['status'] = {'text' => value}
+            send_status_email = true
+        end
+      end
+      if send_status_email       
+        OrdersMailer.customer_status_updated(li.order).deliver
+      end    
+      resp.success = save && li.save
+      render :json => resp
+    end
+        
+    # DELETE /admin/orders/:order_id/line-items/:id
+    def admin_delete
+      return if !user_is_allowed('orders', 'delete')
+      li = LineItem.find(params[:id])
+      order = li.order
+      li.destroy
+      order.calculate_total
+      order.save                  
+      render :json => Caboose::StdClass.new({
+        :redirect => '/admin/orders'
+      })
+    end
+    
+    # GET /admin/orders/:order_id/line-items/:id/highlight
+    def admin_highlight
+      return if !user_is_allowed('orders', 'view')
+      li = LineItem.find(params[:id])
+      v = li.variant
+      redirect_to "/admin/products/#{v.product_id}/variants?highlight=#{v.id}"
+    end
+    
+    # GET /admin/orders/line-items/status-options
+    def admin_status_options
+      arr = ['pending', 'ready to ship', 'shipped', 'backordered', 'canceled']
+      options = []
+      arr.each do |status|
+        options << {
+          :value => status,
+          :text  => status
+        }
+      end
+      render :json => options
+    end
+    
+    # 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 = []
+      query = [""]
+      title.each do |str|
+        where << 'lower(title) like ?'
+        query << "%#{str}%"
+      end
+      where = where.join(' and ')
+      query[0] = "select id, title from store_products where #{where} order by title limit 20"          
+      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
+    end
+        
+  end
+end

data/app/controllers/caboose/order_packages_controller.rb

@@ -0,0 +1,304 @@
+module Caboose
+  class OrderPackagesController < Caboose::ApplicationController
+    
+    # GET /admin/orders/:order_id/packages/json
+    def admin_json      
+      return if !user_is_allowed('orders', 'view')
+      order = Order.find(params[:order_id])
+      render :json => order.packages.as_json(
+        :include => { :shipping_package => { :include => :shipping_methods} }
+      )
+    end     
+
+    # POST /admin/orders/:order_id/packages
+    def admin_add
+      return if !user_is_allowed('orders', 'add')
+      
+      resp = StdClass.new
+                              
+      if    params[:shipping_package_id].strip.length  == 0 then resp.error = "Please select a shipping package."
+      elsif params[:shipping_method_id].strip.length   == 0 then resp.error = "Please select a shipping method."      
+      else
+
+        op = OrderPackage.new(
+          :order_id            => params[:order_id],
+          :shipping_package_id => params[:shipping_package_id],
+          :shipping_method_id  => params[:shipping_method_id],
+          :status              => OrderPackage::STATUS_PENDING          
+        )        
+        op.save        
+        resp.new_id = op.id
+        resp.redirect = "/admin/orders/#{params[:order_id]}/packages/#{op.id}"
+        
+      end
+      
+      render :json => resp
+    end
+    
+    # PUT /admin/orders/:order_id/packages/:id
+    def admin_update
+      return if !user_is_allowed('orders', 'edit')
+      
+      resp = Caboose::StdClass.new
+      op = OrderPackage.find(params[:id])    
+      
+      save = true    
+      params.each do |name,value|
+        case name
+          when 'order_id'            then op.order_id              = value
+          when 'shipping_method_id'  then op.shipping_method_id    = value
+          when 'shipping_package_id' then op.shipping_package_id   = value
+          when 'status'              then op.status                = value
+          when 'tracking_number'     then op.tracking_number       = value
+          when 'total'               then op.total                 = value
+          when 'package_method'      then
+            arr = value.split('_')
+            op.shipping_package_id = arr[0]
+            op.shipping_method_id = arr[1]                      
+        end
+      end
+      op.order.calculate_total    
+      resp.success = save && op.save
+      render :json => resp
+    end
+    
+    # PUT /admin/orders/:order_id/line-items/:id
+    def admin_update_line_item
+      return if !user_is_allowed('orders', 'edit')
+      
+      resp = Caboose::StdClass.new({'attributes' => {}})
+      li = LineItem.find(params[:id])    
+      
+      save = true
+      send_status_email = false    
+      params.each do |name,value|
+        case name
+          when 'quantity'
+            li.quantity = value
+            li.save
+                      	  
+            # Recalculate everything
+            r = ShippingCalculator.rate(li.order, li.order.shipping_method_code)
+            li.order.shipping = r['negotiated_rate'] / 100
+            li.order.handling = (r['negotiated_rate'] / 100) * 0.05
+            tax_rate = TaxCalculator.tax_rate(li.order.shipping_address)
+            li.order.tax = li.order.subtotal * tax_rate
+            li.order.calculate_total
+            li.order.save
+            
+          when 'tracking_number'
+            li.tracking_number = value
+            send_status_email = true
+          when 'status'
+            li.status = value
+            resp.attributes['status'] = {'text' => value}
+            send_status_email = true
+        end
+      end
+      if send_status_email       
+        OrdersMailer.customer_status_updated(li.order).deliver
+      end
+      resp.success = save && li.save
+      render :json => resp
+    end 
+    
+    # DELETE /admin/orders/:order_id/packages/:id
+    def admin_delete
+      return if !user_is_allowed('orders', 'delete')
+      resp = StdClass.new
+      op = OrderPackage.find(params[:id])
+      if op.line_items.nil? || op.line_items.count == 0
+        op.destroy
+        resp.redirect = "/admin/orders/#{params[:order_id]}"
+      else
+        resp.error = "Only empty packages can be deleted."
+      end
+      render :json => resp
+    end
+    
+    # GET /admin/orders/line-item-status-options
+    def admin_line_item_status_options
+      arr = ['pending', 'ready to ship', 'shipped', 'backordered', 'canceled']
+      options = []
+      arr.each do |status|
+        options << {
+          :value => status,
+          :text  => status
+        }
+      end
+      render :json => options
+    end
+    
+    # GET /admin/orders/:id/capture
+    def capture_funds
+      return if !user_is_allowed('orders', 'edit')
+      
+      response = Caboose::StdClass.new({
+        'refresh' => nil,
+        'error'   => nil,
+        'success' => nil
+      })
+      
+      order = Order.find(params[:id])
+      
+      if 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."
+      else
+        if PaymentProcessor.capture(order)
+          order.update_attribute(:financial_status, 'captured')
+          response.success = 'Captured funds successfully'
+        else
+          response.error = 'Error capturing funds'
+        end
+          
+        #if (order.discounts.any? && order.total < order.discounts.first.amount_current) || PaymentProcessor.capture(order)
+        #  order.financial_status = 'captured'
+        #  order.save
+        #  
+        #  if order.discounts.any?
+        #    order.update_attribute(:amount_discounted, order.discounts.first.amount_current)
+        #    order.update_gift_cards
+        #  end
+        #  
+        #  response.success = "Captured funds successfully"
+        #else
+        #  response.error = "Error capturing funds."
+        #end
+      end
+      
+      render :json => response
+    end
+
+    # GET /admin/orders/:id/void
+    #def void
+    #  return if !user_is_allowed('orders', 'edit')
+    #
+    #  response = Caboose::StdClass.new({
+    #    'refresh' => nil,
+    #    'error' => nil,
+    #    'success' => nil
+    #  })
+    #
+    #  order = Order.find(params[:id])
+    #
+    #  if order.financial_status == 'captured'
+    #    response.error = "This order has already been captured, you will need to refund instead"
+    #  else
+    #    if order.total < order.amount_discounted || PaymentProcessor.void(order)
+    #      order.financial_status = 'cancelled'
+    #      order.status = 'voided'
+    #      order.save
+    #    
+    #      response.success = "Order voided successfully"
+    #    else
+    #      response.error = "Error voiding order."
+    #    end
+    #  end
+    #
+    #  render json: response
+    #end
+  
+    # GET /admin/orders/:id/refund
+    # def refund
+    #   return if !user_is_allowed('orders', 'edit')
+    # 
+    #   response = Caboose::StdClass.new({
+    #     'refresh' => nil,
+    #     'error' => nil,
+    #     'success' => nil
+    #   })
+    # 
+    #   order = Order.find(params[:id])
+    # 
+    #   if order.financial_status != 'captured'
+    #     response.error = "This order hasn't been captured yet, you will need to void instead"
+    #   else
+    #     ap order.total
+    #     ap order.amount_discounted
+    #     
+    #     if order.total < order.amount_discounted || PaymentProcessor.refund(order)
+    #       order.financial_status = 'refunded'
+    #       order.status = 'refunded'
+    #       order.save
+    #       
+    #       discount = order.discounts.first
+    #       ap '==========================='
+    #       ap order.amount_discounted + discount.amount_current
+    #       ap '==========================='
+    #       discount.update_attribute(:amount_current, order.amount_discounted + discount.amount_current) if order.discounts.any?
+    #       
+    #       response.success = "Order refunded successfully"
+    #     else
+    #       response.error = "Error refunding order."
+    #     end
+    #   end
+    # 
+    #   render json: response
+    # end
+
+    # 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.each do |s|
+        options << {
+          'text' => s,
+          'value' => s
+        }
+      end       
+      render :json => options    
+    end
+    
+    # GET /admin/orders/test-info
+    def admin_mail_test_info
+      TestMailer.test_info.deliver
+      render :text => "Sent email to info@tuskwearcollection.com on #{DateTime.now.strftime("%F %T")}"
+    end
+    
+    # GET /admin/orders/test-gmail
+    def admin_mail_test_gmail
+      TestMailer.test_gmail.deliver
+      render :text => "Sent email to william@nine.is on #{DateTime.now.strftime("%F %T")}"
+    end
+    
+    # GET /admin/orders/google-feed
+    def admin_google_feed
+      d2 = DateTime.now
+      d1 = DateTime.now
+      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')
+        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|
+          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")}"                              
+        end
+      end
+      
+      # Save when we made the last call
+      setting = if Caboose::Setting.exists?(:name => 'google_feed_date_last_submitted')
+        Caboose::Setting.where(:name => 'google_feed_date_last_submitted').first
+      else
+        Caboose::Setting.new(:name => 'google_feed_date_last_submitted')
+      end
+      
+      setting.value = d2.strftime("%F %T")
+      setting.save            
+                   
+      # Print out the lines
+      render :text => tsv.join("\n")
+    end
+  end
+end

data/app/controllers/caboose/orders_controller.rb

@@ -27,10 +27,19 @@ module Caboose
     
     # GET /admin/orders/new
     def admin_new
-      return if !user_is_allowed('orders', 'add')
-      @products = Product.by_title
+      return if !user_is_allowed('orders', 'add')      
       render :layout => 'caboose/admin'
     end
+    
+    # POST /admin/orders
+    def admin_add
+      return if !user_is_allowed('orders', 'add')
+      order = Order.create(
+        :status => 'pending',                          
+        :financial_status => 'pending'
+      )    
+      render :json => { :sucess => true, :redirect => "/admin/orders/#{order.id}" }
+    end
       
     # GET /admin/orders/:id
     def admin_edit
@@ -160,7 +169,19 @@ module Caboose
     def admin_json
       return if !user_is_allowed('orders', 'edit')    
       order = Order.find(params[:id])
-      render :json => order, :include => { :order_line_items => { :include => :variant }}
+      if order.shipping_address_id.nil?
+        sa = Address.create
+        order.shipping_address_id = sa.id
+        order.save
+      end
+      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
+      ])
     end
   
     # GET /admin/orders/:id/print
@@ -185,17 +206,12 @@ module Caboose
       save = true    
       params.each do |name,value|
         case name
-          when 'tax'
-            order.tax = value          
-          when 'shipping'
-            order.shipping = value
-          when 'handling'
-            order.handling = value
-          when 'discount'
-            order.discount = value        
-          when 'status'
-            order.status = value
-            resp.attributes['status'] = {'text' => value}
+          when 'tax'         then order.tax         = value          
+          when 'shipping'    then order.shipping    = value
+          when 'handling'    then order.handling    = value
+          when 'discount'    then order.discount    = value        
+          when 'status'      then order.status      = value
+          when 'customer_id' then order.customer_id = value            
         end
       end
       order.calculate_total    
@@ -203,46 +219,6 @@ module Caboose
       render :json => resp
     end
     
-    # PUT /admin/orders/:order_id/line-items/:id
-    def admin_update_line_item
-      return if !user_is_allowed('orders', 'edit')
-      
-      resp = Caboose::StdClass.new({'attributes' => {}})
-      li = OrderLineItem.find(params[:id])    
-      
-      save = true
-      send_status_email = false    
-      params.each do |name,value|
-        case name
-          when 'quantity'
-            li.quantity = value
-            li.save
-                      	  
-            # Recalculate everything
-            r = ShippingCalculator.rate(li.order, li.order.shipping_method_code)
-            li.order.shipping = r['negotiated_rate'] / 100
-            li.order.handling = (r['negotiated_rate'] / 100) * 0.05
-            tax_rate = TaxCalculator.tax_rate(li.order.shipping_address)
-            li.order.tax = li.order.subtotal * tax_rate
-            li.order.calculate_total
-            li.order.save
-            
-          when 'tracking_number'
-            li.tracking_number = value
-            send_status_email = true
-          when 'status'
-            li.status = value
-            resp.attributes['status'] = {'text' => value}
-            send_status_email = true
-        end
-      end
-      if send_status_email       
-        OrdersMailer.customer_status_updated(li.order).deliver
-      end
-      resp.success = save && li.save
-      render :json => resp
-    end 
-    
     # DELETE /admin/orders/:id
     def admin_delete
       return if !user_is_allowed('orders', 'delete')
@@ -252,19 +228,6 @@ module Caboose
       })
     end
     
-    # GET /admin/orders/line-item-status-options
-    def admin_line_item_status_options
-      arr = ['pending', 'ready to ship', 'shipped', 'backordered', 'canceled']
-      options = []
-      arr.each do |status|
-        options << {
-          :value => status,
-          :text  => status
-        }
-      end
-      render :json => options
-    end
-    
     # GET /admin/orders/:id/capture
     def capture_funds
       return if !user_is_allowed('orders', 'edit')
@@ -378,13 +341,7 @@ module Caboose
     def admin_status_options
       return if !user_is_allowed('categories', 'view')
       statuses = ['cart', 'pending', 'ready to ship', 'shipped', 'canceled']
-      options = []
-      statuses.each do |s|
-        options << {
-          'text' => s,
-          'value' => s
-        }
-      end       
+      options = statuses.collect{ |s| { 'text' => s, 'value' => s }}       
       render :json => options    
     end