effective_orders 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 241819ceeb137196d59b1383c99ff092e65e1fa7
-  data.tar.gz: d79d5f2798e61e92ab25f686f1db9624d2706dec
+  metadata.gz: f154bcf1f7cdb3364371b6b2c794c9d4ac232397
+  data.tar.gz: f852ff91b864ffd6a443e0a7fe5a3d23aa4fd1cf
 SHA512:
-  metadata.gz: c74dcef00e1d2506b7a425582b3b51eaee276c007861e90ea5a275b78d1e40ff089332c7c084bf4cb63aaf9126b1004f146a68f2dfa3a24e00ba7c345f37f115
-  data.tar.gz: 1087399127980e9089fb2f1dd41d5d01eb2a850ac4f96e6074b82540b7f8ea4214aca1b0404ecba099cd6de13367c5a6bc192af83052cfd37d47d1c21615bae8
+  metadata.gz: f6810b9d5300273c7c7b4eafa63b800a6c7a1e58ea0acaf7453785fb030333b13db4f5a4d1287e6db739c2ea6217f100774ab1e3a18074f847e4bdbc9f79a13c
+  data.tar.gz: 4bf6074ecb430326d9a76bace99020685ddb0bad4d4f279fc443dcf3434adef7cccdc06afd773016de172e9696d30663b59cda1556e9b318341a05983087e776

data/app/controllers/admin/orders_controller.rb

@@ -32,15 +32,17 @@ module Admin
           flash[:success] = 'Successfully updated order'
         end
 
-        redirect_to effective_orders.admin_order_path(@order)
+        redirect_to(admin_redirect_path)
       else
-        flash.now[:danger] = 'Unable to update order'
+        flash.now[:danger] = "Unable to update order: #{@order.errors.full_messages.to_sentence}"
         render action: :show
       end
     end
 
     def new
       @order = Effective::Order.new
+      @order.user = (User.find(params[:user_id]) rescue nil) if params[:user_id]
+
       @page_title = 'New Order'
 
       authorize_effective_order!
@@ -60,14 +62,13 @@ module Admin
       @order.attributes = order_params.except(:order_items_attributes, :user_id)
 
       if @order.create_as_pending
-        path_for_redirect = params[:commit] == 'Save and Add New' ? effective_orders.new_admin_order_path : effective_orders.admin_order_path(@order)
         message = 'Successfully created order'
         message << ". #{@order.user.email} has been sent a request for payment." if @order.send_payment_request_to_buyer?
         flash[:success] = message
-        redirect_to path_for_redirect
+        redirect_to(admin_redirect_path)
       else
         @page_title = 'New Order'
-        flash.now[:danger] = 'Unable to create order'
+        flash.now[:danger] = "Unable to create order: #{@order.errors.full_messages.to_sentence}"
         render :new
       end
     end
@@ -89,6 +90,7 @@ module Admin
             provider: order_params[:payment_provider],
             card: order_params[:payment_card],
             email: @order.send_mark_as_paid_email_to_buyer?,
+            skip_buyer_validations: true
           )
         rescue => e
           purchased = false
@@ -96,7 +98,7 @@ module Admin
 
         if purchased
           flash[:success] = 'Order marked as paid successfully'
-          redirect_to effective_orders.admin_order_path(@order)
+          redirect_to(admin_redirect_path)
         else
           flash.now[:danger] = "Unable to mark order as paid: #{@order.errors.full_messages.to_sentence}"
           render action: :mark_as_paid
@@ -136,5 +138,23 @@ module Admin
       EffectiveOrders.authorized?(self, action_name.to_sym, @order || Effective::Order)
     end
 
+    def admin_redirect_path
+      # Allow an app to define effective_orders_admin_redirect_path in their ApplicationController
+      path = if self.respond_to?(:effective_orders_admin_redirect_path)
+        effective_orders_admin_redirect_path(params[:commit], @order)
+      end
+
+      return path if path.present?
+
+      case params[:commit]
+      when 'Save and Add New'
+        effective_orders.new_admin_order_path(user_id: @order.user.try(:to_param))
+      when 'Save and Mark as Paid'
+        effective_orders.mark_as_paid_admin_order_path(@order)
+      else
+        effective_orders.admin_order_path(@order)
+      end
+    end
+
   end
 end

data/app/models/effective/order.rb

@@ -61,11 +61,11 @@ module Effective
     validates :tax, presence: true, unless: Proc.new { |order| order.skip_buyer_validations? }
 
     if EffectiveOrders.require_billing_address  # An admin creating a new pending order should not be required to have addresses
-      validates :billing_address, presence: true, unless: Proc.new { |order| order.new_record? && order.pending? }
+      validates :billing_address, presence: true, unless: Proc.new { |order| (order.new_record? && order.pending?) || order.skip_buyer_validations? }
     end
 
     if EffectiveOrders.require_shipping_address  # An admin creating a new pending order should not be required to have addresses
-      validates :shipping_address, presence: true, unless: Proc.new { |order| order.new_record? && order.pending? }
+      validates :shipping_address, presence: true, unless: Proc.new { |order| (order.new_record? && order.pending?) || order.skip_buyer_validations? }
     end
 
     if ((minimum_charge = EffectiveOrders.minimum_charge.to_i) rescue nil).present?
@@ -319,6 +319,8 @@ module Effective
           self.payment_provider = provider.to_s
           self.payment_card = card.to_s.presence || 'none'
 
+          self.skip_buyer_validations = skip_buyer_validations
+
           save!(validate: validate)
 
           order_items.each { |item| (item.purchasable.purchased!(self, item) rescue nil) }

data/app/views/admin/orders/_form.html.haml

@@ -25,8 +25,4 @@
     %h3 Internal Note
     = f.input :note_internal, label: 'Internal note', hint: 'For internal admin use only.  This note will never be displayed to the buyer.'
 
-
-    %p.text-right
-      = f.button :submit, 'Save', data: { disable_with: 'Saving...' }
-      = f.button :submit, 'Save and Add New', data: { disable_with: 'Saving...' }
-      = link_to 'Cancel', effective_orders.admin_orders_path
+    = render partial: '/admin/orders/order_actions', locals: { order: @order, form: f, f: f }

data/app/views/admin/orders/_form_mark_as_paid.html.haml

@@ -28,6 +28,5 @@
   %h3 Note to Buyer
   = f.input :note_to_buyer, label: 'Note to buyer', hint: 'This is displayed to the buyer on all order receipts.'
 
-  %p.text-right
-    = f.button :submit, 'Mark Order as Paid', data: { disable_with: 'Saving...' }
+  = render partial: '/admin/orders/order_actions', locals: { order: @order, form: f, f: f }
 

data/app/views/admin/orders/_order_actions.html.haml

@@ -0,0 +1,6 @@
+%p.text-right
+  = form.button :submit, 'Save', data: { disable_with: 'Saving...' }
+  = form.button :submit, 'Save and Add New', data: { disable_with: 'Saving...' }
+  - unless params[:action] == 'mark_as_paid'
+    = form.button :submit, 'Save and Mark as Paid', data: { disable_with: 'Saving...' }
+  = link_to 'Cancel', effective_orders.admin_orders_path

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '2.1.7'.freeze
+  VERSION = '2.1.8'.freeze
 end

data/spec/controllers/admin/orders_controller_spec.rb

@@ -91,7 +91,7 @@ describe Admin::OrdersController, type: :controller do
           post :create, order_params.merge(commit: button_pressed)
 
           expect(response).to be_redirect
-          expect(response).to redirect_to EffectiveOrders::Engine.routes.url_helpers.new_admin_order_path
+          expect(response).to redirect_to EffectiveOrders::Engine.routes.url_helpers.new_admin_order_path(user_id: 1)
           expect(flash[:success]).to eq "Successfully created order. #{assigns(:order).user.email} has been sent a request for payment."
         end
       end
@@ -132,7 +132,7 @@ describe Admin::OrdersController, type: :controller do
           expect(response).to be_successful
           expect(response).to render_template :new
           expect(assigns(:page_title)).to eq 'New Order'
-          expect(flash[:danger]).to eq 'Unable to create order'
+          expect(flash[:danger].to_s.include?('Unable to create order')).to eq true
         end
       end
 

data/spec/dummy/log/test.log

@@ -18,3 +18,6 @@
    (0.1ms)  SELECT MAX("orders"."id") FROM "orders"
    (0.1ms)  SELECT MAX("orders"."id") FROM "orders"
    (0.1ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.1ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.1ms)  SELECT MAX("orders"."id") FROM "orders"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Code and Effect
@@ -317,6 +317,7 @@ files:
 - app/views/admin/orders/_form.html.haml
 - app/views/admin/orders/_form_mark_as_paid.html.haml
 - app/views/admin/orders/_form_note_internal.html.haml
+- app/views/admin/orders/_order_actions.html.haml
 - app/views/admin/orders/_order_item_fields.html.haml
 - app/views/admin/orders/_order_payment_details.html.haml
 - app/views/admin/orders/index.html.haml