Vouchers part 2

app/controllers/admin/vouchers_controller.rb

@@ -9,14 +9,11 @@ def new
     end
 
     def create
-      voucher_params = permitted_resource_params.merge(enterprise: @enterprise)
-      @voucher = Voucher.create(voucher_params)
+      @voucher = Voucher.create(permitted_resource_params.merge(enterprise: @enterprise))
 
       if @voucher.save
-        redirect_to(
-          "#{edit_admin_enterprise_path(@enterprise)}#vouchers_panel",
-          flash: { success: flash_message_for(@voucher, :successfully_created) }
-        )
+        flash[:success] = flash_message_for(@voucher, :successfully_created)
+        redirect_to edit_admin_enterprise_path(@enterprise, anchor: :vouchers_panel)
       else
         flash[:error] = @voucher.errors.full_messages.to_sentence
         render :new

app/controllers/concerns/checkout_callbacks.rb

@@ -14,7 +14,7 @@ module CheckoutCallbacks
     prepend_before_action :require_order_cycle
     prepend_before_action :require_distributor_chosen
 
-    before_action :load_order, :associate_user, :load_saved_addresses, :load_saved_credit_cards
+    before_action :load_order, :associate_user, :load_saved_addresses
     before_action :load_shipping_methods, if: -> { params[:step] == "details" }
 
     before_action :ensure_order_not_completed
@@ -30,8 +30,6 @@ def load_order
     @order.manual_shipping_selection = true
     @order.checkout_processing = true
 
-    @voucher_adjustment = @order.voucher_adjustments.first
-
     redirect_to(main_app.shop_path) && return if redirect_to_shop?
     redirect_to_cart_path && return unless valid_order_line_items?
   end
@@ -43,11 +41,6 @@ def load_saved_addresses
     @order.ship_address ||= finder.ship_address
   end
 
-  def load_saved_credit_cards
-    @saved_credit_cards = spree_current_user&.credit_cards&.with_payment_profile.to_a
-    @selected_card = nil
-  end
-
   def load_shipping_methods
     @shipping_methods = available_shipping_methods.sort { |a, b| a.name.casecmp(b.name) }
   end

app/controllers/split_checkout_controller.rb

@@ -25,12 +25,12 @@ def edit
     redirect_to_step_based_on_order unless params[:step]
     check_step if params[:step]
 
-    flash_error_when_no_shipping_method_available if available_shipping_methods.none?
+    return if available_shipping_methods.any?
+
+    flash[:error] = I18n.t('split_checkout.errors.no_shipping_methods_available')
   end
 
   def update
-    return process_voucher if params[:apply_voucher].present?
-
     if confirm_order || update_order
       return if performed?
 
@@ -60,27 +60,6 @@ def render_error
       replace("#flashes", partial("shared/flashes", locals: { flashes: flash }))
   end
 
-  def render_voucher_section_or_redirect
-    respond_to do |format|
-      format.cable_ready { render_voucher_section }
-      format.html { redirect_to checkout_step_path(:payment) }
-    end
-  end
-
-  # Using the power of cable_car we replace only the #voucher_section instead of reloading the page
-  def render_voucher_section
-    render(
-      status: :ok,
-      cable_ready: cable_car.replace(
-        "#voucher-section",
-        partial(
-          "split_checkout/voucher_section",
-          locals: { order: @order, voucher_adjustment: @order.voucher_adjustments.first }
-        )
-      )
-    )
-  end
-
   def order_error_messages
     # Remove ship_address.* errors if no shipping method is not selected
     remove_ship_address_errors if no_ship_address_needed?
@@ -125,10 +104,6 @@ def bill_address_error_order(error)
     end
   end
 
-  def flash_error_when_no_shipping_method_available
-    flash[:error] = I18n.t('split_checkout.errors.no_shipping_methods_available')
-  end
-
   def check_payments_adjustments
     @order.payments.each(&:ensure_correct_adjustment)
   end
@@ -201,40 +176,6 @@ def shipping_method_ship_address_not_required?
     selected_shipping_method.first.require_ship_address == false
   end
 
-  def process_voucher
-    if add_voucher
-      VoucherAdjustmentsService.calculate(@order)
-      render_voucher_section_or_redirect
-    elsif @order.errors.present?
-      render_error
-    end
-  end
-
-  def add_voucher
-    if params.dig(:order, :voucher_code).blank?
-      @order.errors.add(:voucher, I18n.t('split_checkout.errors.voucher_not_found'))
-      return false
-    end
-
-    # Fetch Voucher
-    voucher = Voucher.find_by(code: params[:order][:voucher_code], enterprise: @order.distributor)
-
-    if voucher.nil?
-      @order.errors.add(:voucher, I18n.t('split_checkout.errors.voucher_not_found'))
-      return false
-    end
-
-    adjustment = voucher.create_adjustment(voucher.code, @order)
-
-    unless adjustment.valid?
-      @order.errors.add(:voucher, I18n.t('split_checkout.errors.add_voucher_error'))
-      adjustment.errors.each { |error| @order.errors.import(error) }
-      return false
-    end
-
-    true
-  end
-
   def summary_step?
     params[:step] == "summary"
   end
@@ -262,6 +203,7 @@ def validate_details!
 
   def validate_payment!
     return true if params.dig(:order, :payments_attributes, 0, :payment_method_id).present?
+    return true if @order.zero_priced_order?
 
     @order.errors.add :payment_method, I18n.t('split_checkout.errors.select_a_payment_method')
   end

app/controllers/voucher_adjustments_controller.rb

@@ -1,32 +1,77 @@
 # frozen_string_literal: true
 
 class VoucherAdjustmentsController < BaseController
-  include CablecarResponses
+  before_action :set_order
+
+  def create
+    if add_voucher
+      VoucherAdjustmentsService.calculate(@order)
+      @order.update_totals_and_states
+
+      update_payment_section
+    elsif @order.errors.present?
+      render_error
+    end
+  end
 
   def destroy
+    @order.voucher_adjustments.find_by(id: params[:id])&.destroy
+
+    update_payment_section
+  end
+
+  private
+
+  def set_order
     @order = current_order
+  end
 
-    @order.voucher_adjustments.find_by(id: params[:id])&.destroy
+  def add_voucher
+    if voucher_params[:voucher_code].blank?
+      @order.errors.add(:voucher_code, I18n.t('split_checkout.errors.voucher_not_found'))
+      return false
+    end
 
-    respond_to do |format|
-      format.cable_ready { render_voucher_section }
-      format.html { redirect_to checkout_step_path(:payment) }
+    voucher = Voucher.find_by(code: voucher_params[:voucher_code], enterprise: @order.distributor)
+
+    if voucher.nil?
+      @order.errors.add(:voucher_code, I18n.t('split_checkout.errors.voucher_not_found'))
+      return false
+    end
+
+    adjustment = voucher.create_adjustment(voucher.code, @order)
+
+    unless adjustment.valid?
+      @order.errors.add(:voucher_code, I18n.t('split_checkout.errors.add_voucher_error'))
+      adjustment.errors.each { |error| @order.errors.import(error) }
+      return false
     end
+
+    true
   end
 
-  private
+  def update_payment_section
+    render cable_ready: cable_car.replace(
+      selector: "#checkout-payment-methods",
+      html: render_to_string(partial: "split_checkout/payment", locals: { step: "payment" })
+    )
+  end
+
+  def render_error
+    flash.now[:error] = @order.errors.full_messages.to_sentence
 
-  # Using the power of cable_car we replace only the #voucher_section instead of reloading the page
-  def render_voucher_section
-    render(
-      status: :ok,
-      cable_ready: cable_car.replace(
+    render status: :unprocessable_entity, cable_ready: cable_car.
+      replace("#flashes", partial("shared/flashes", locals: { flashes: flash })).
+      replace(
         "#voucher-section",
         partial(
           "split_checkout/voucher_section",
           locals: { order: @order, voucher_adjustment: @order.voucher_adjustments.first }
         )
       )
-    )
+  end
+
+  def voucher_params
+    params.require(:order).permit(:voucher_code)
   end
 end

app/helpers/checkout_helper.rb

@@ -120,6 +120,8 @@ def payment_method_price(method, order)
   end
 
   def payment_or_shipping_price(method, order)
+    return unless method
+
     price = method.compute_amount(order)
     if price.zero?
       t('checkout_method_free')

app/helpers/spree/payment_methods_helper.rb

@@ -5,11 +5,13 @@ module PaymentMethodsHelper
     def payment_method(payment)
       # hack to allow us to retrieve the name of a "deleted" payment method
       id = payment.payment_method_id
+      return if id.nil?
+
       Spree::PaymentMethod.find_with_destroyed(id)
     end
 
     def payment_method_name(payment)
-      payment_method(payment).name
+      payment_method(payment)&.name
     end
   end
 end

app/models/spree/order.rb

@@ -23,7 +23,7 @@ class Order < ApplicationRecord
       go_to_state :delivery
       go_to_state :payment, if: ->(order) {
         order.update_totals
-        order.payment_required?
+        order.payment_required? || order.zero_priced_order?
       }
       go_to_state :confirmation
       go_to_state :complete
@@ -219,6 +219,12 @@ def payment_required?
       total.to_f > 0.0 && !skip_payment_for_subscription?
     end
 
+    # There are items present in the order, but either the items have zero price,
+    # or the order's total has been modified (maybe discounted) to zero.
+    def zero_priced_order?
+      line_items.count.positive? && total.zero?
+    end
+
     # Returns the relevant zone (if any) to be used for taxation purposes.
     # Uses default tax zone unless there is a specific match
     def tax_zone
@@ -615,6 +621,10 @@ def process_each_payment
       raise Core::GatewayError, Spree.t(:no_pending_payments) if pending_payments.empty?
 
       pending_payments.each do |payment|
+        if payment.amount.zero? && zero_priced_order?
+          payment.update_columns(state: "completed", captured_at: Time.zone.now)
+        end
+
         break if payment_total >= total
 
         yield payment

app/services/voucher_adjustments_service.rb

@@ -19,8 +19,10 @@ def self.calculate(order)
     # For now we just assume it is either all tax included in price or all tax excluded from price.
     if order.additional_tax_total.positive?
       handle_tax_excluded_from_price(order, amount)
-    else
+    elsif order.included_tax_total.positive?
       handle_tax_included_in_price(order, amount)
+    else
+      adjustment.amount = amount
     end
 
     # Move to closed state