caboose-store 0.0.10 → 0.0.11

data/app/controllers/caboose_store/orders_controller.rb

@@ -1,43 +1,160 @@
 module CabooseStore
-  class OrdersController < ApplicationController
-      
-    helper :authorize_net
-    protect_from_forgery :except => :authnet_relay_response
+  class OrdersController < CabooseStore::ApplicationController
     
     # GET /admin/orders
     def admin_index
       return if !user_is_allowed('orders', 'view')
-  
-      @gen = Caboose::PageBarGenerator.new(params, {
-          'customer_id'           => '', 
-          'status'                => 'pending',
-          'shipping_method_code'  => '',
-          'id'                    => ''
-      },{
-          'model'       => 'CabooseStore::Order',
-          'sort'        => 'id',
-          'desc'        => 1,
-          'base_url'    => '/admin/orders'
-      })    
-      @orders = @gen.items
+      
+      @pager = Caboose::PageBarGenerator.new(params, {
+        'customer_id'          => '', 
+        'status'               => 'pending',
+        'shipping_method_code' => '',
+        'id'                   => ''
+      }, {
+        'model'          => 'CabooseStore::Order',
+        'sort'           => 'id',
+        'desc'           => 1,
+        'base_url'       => '/admin/orders',
+        'use_url_params' => false
+      })
+      
+      @orders    = @pager.items
       @customers = Caboose::User.reorder('last_name, first_name').all
+      
       render :layout => 'caboose/admin'
     end
     
     # GET /admin/orders/new
     def admin_new
-      return if !user_is_allowed('orders', 'add')       
-      @products = Product.reorder('title').all    
+      return if !user_is_allowed('orders', 'add')
+      @products = Product.by_title
       render :layout => 'caboose/admin'
     end
       
     # GET /admin/orders/:id
     def admin_edit
-      return if !user_is_allowed('orders', 'edit')    
+      return if !user_is_allowed('orders', 'edit')
       @order = Order.find(params[:id])
       render :layout => 'caboose/admin'
     end
     
+    # GET /admin/orders/:id/void
+    def admin_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 PaymentProcessor.void(order)
+          order.update_attributes(
+            :financial_status => 'voided',
+            :status => 'cancelled'
+          )
+          
+          # Add the variant quantities ordered back
+          #order.cancel
+          
+          response.success = "Order voided successfully"
+        else
+          response.error = "Error voiding order."
+        end
+      end
+    
+      render :json => response
+    end
+  
+    # GET /admin/orders/:id/refund
+    def admin_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
+        if PaymentProcessor.refund(order)
+          order.update_attributes(
+            :financial_status => 'refunded',
+            :status => 'cancelled'
+          )
+          
+          response.success = 'Order refunded successfully'
+        else
+          response.error = 'Error refunding order'
+        end
+        
+        #if order.calculate_net < (order.amount_discounted || 0) || PaymentProcessor.refund(order)
+        #  order.financial_status = 'refunded'
+        #  order.status = 'refunded'
+        #  order.save
+        #  
+        #  if order.discounts.any?
+        #    discount = order.discounts.first
+        #    amount_to_refund = order.calculate_net < order.amount_discounted ? order.calculate_net : order.amount_discounted
+        #    discount.update_attribute(:amount_current, amount_to_refund + discount.amount_current)
+        #  end
+        #  
+        #  response.success = "Order refunded successfully"
+        #else
+        #  response.error = "Error refunding order."
+        #end
+      end
+    
+      render json: response
+      
+      # 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
+      #   if PaymentProcessor.refund(order)
+      #     order.financial_status = 'refunded'
+      #     order.status = 'refunded'
+      #     order.save
+      #     
+      #     # Add the variant quantities ordered back
+      #     order.cancel
+      #     
+      #     response.success = "Order refunded successfully"
+      #   else
+      #     response.error = "Error refunding order."
+      #   end
+      # end
+      #     
+      # render :json => response
+    end
+    
+    # POST /admin/orders/:id/resend-confirmation
+    def admin_resend_confirmation
+      if Order.find(params[:id]).resend_confirmation
+        render :json => { success: "Confirmation re-sent successfully." }
+      else
+        render :json => { error: "There was an error re-sending the email." }
+      end
+    end
+    
     # GET /admin/orders/:id/json
     def admin_json
       return if !user_is_allowed('orders', 'edit')    
@@ -51,7 +168,7 @@ module CabooseStore
        
       pdf = OrderPdf.new
       pdf.order = Order.find(params[:id])             
-      send_data pdf.to_pdf, filename: "order_#{pdf.order.id}.pdf", type: "application/pdf", disposition: "inline"
+      send_data pdf.to_pdf, :filename => "order_#{pdf.order.id}.pdf", :type => "application/pdf", :disposition => "inline"
       
       #@order = Order.find(params[:id])
       #render :layout => 'caboose/admin'
@@ -141,7 +258,7 @@ module CabooseStore
       arr.each do |status|
         options << {
           :value => status,
-          :text => status
+          :text  => status
         }
       end
       render :json => options
@@ -151,57 +268,111 @@ module CabooseStore
     def capture_funds
       return if !user_is_allowed('orders', 'edit')
       
-      resp = Caboose::StdClass.new({
+      response = Caboose::StdClass.new({
         'refresh' => nil,
-        'error' => 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      
-        trans = AuthorizeNet::AIM::Transaction.new(
-          AUTHORIZE_NET_CONFIG['api_login_id'], 
-          AUTHORIZE_NET_CONFIG['api_transaction_key'],          
-          :gateway => :production
-          #:test => true
-        )
-        amount = order.total < order.auth_amount ? order.total : nil
-        r = trans.prior_auth_capture(order.transaction_id, amount)
-        Caboose.log(r.inspect)
-        if r.success?
-          order.financial_status = 'captured'
-          order.save
-          resp.success = "Captured funds successfully."
-        else        
-          if r.connection_failure?
-            resp.error = "Error connecting to authorize.net."
-          else
-            resp.error = "Error capture funds."
-          end
+      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 => resp
-    end
-    
-    # GET /admin/orders/:id/send-to-quickbooks
-    def admin_send_to_quickbooks
-      return if !user_is_allowed('orders', 'edit')
       
-      resp = Caboose::StdClass.new({
-        'refresh' => nil,
-        'success' => nil,
-        'error' => nil
-      })
-      order = Order.find(params[:id])    
-      Quickbooks.create_order(order)
-      resp.success = "Order sent to quickbooks successfully."
-      render :json => resp
+      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')
@@ -216,38 +387,6 @@ module CabooseStore
       render :json => options    
     end
     
-    # GET  /admin/orders/authnet-relay-response
-    # POST /admin/orders/authnet-relay-response  
-    #def authnet_relay_response
-    #  sim_response = AuthorizeNet::SIM::Response.new(params)
-    #  if sim_response.success?(AUTHORIZE_NET_CONFIG['api_login_id'], AUTHORIZE_NET_CONFIG['merchant_hash_value'])      
-    #    if (params[:x_response_code].to_i == 1) # Approved
-    #      order = Order.find(params[:x_invoice_num])
-    #      order.date_captured = DateTime.now        
-    #      order.financial_status = 'captured'        
-    #      order.save        
-    #    end      
-    #  end
-    #  render :text => sim_response.direct_post_reply('https://tuskwearadmin.herokuapp.com/admin/orders/authnet-receipt', :include => true)
-    #end
-    
-    # GET /admin/orders/authnet-receipt
-    #def authnet_receipt
-    #  return if !user_is_allowed('orders', 'edit')
-    #  
-    #  resp = Caboose::StdClass.new({
-    #    'refresh' => nil,
-    #    'error' => nil
-    #  })
-    #  
-    #  if (params[:x_response_code].to_i == 1) # Approved
-    #    resp.refresh = true
-    #  else 
-    #    resp.error = "There was an error capture funds:<br /><br />#{params[:x_response_reason_text]}"      
-    #  end
-    #  render :text => "<script type='text/javascript'>parent.capture_funds_response(#{resp.to_json});</script>"
-    #end
-    
     # GET /admin/orders/test-info
     def admin_mail_test_info
       TestMailer.test_info.deliver
@@ -284,16 +423,17 @@ module CabooseStore
       end
       
       # Save when we made the last call
-      setting = Caboose::Setting.exists?(:name => 'google_feed_date_last_submitted') ? 
+      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_store/product_images_controller.rb

@@ -1,5 +1,5 @@
 module CabooseStore
-  class ProductImagesController < ApplicationController  
+  class ProductImagesController < CabooseStore::ApplicationController  
       
     #=============================================================================
     # Admin actions