accountability 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25f8546f25aae663976cd6cd712b38b444a385a9b5b609bf9f0fa0f1f62e0bb0
-  data.tar.gz: 278fb73d9c9d2f9d3a5c7ed609514b82cceb9db892508cb5bda6464b8e959607
+  metadata.gz: ea198d3d5114628829df3f4b29e3d33ee1dff1899113b42846704842bd7bfdd8
+  data.tar.gz: 9f9496c534dd51ec485b94f4e6557d3be874e96168f3e7d5b00283ed1397cec6
 SHA512:
-  metadata.gz: 4bfd0bf5a59e3a8804a96739d416f9dbbb6ade1a56d6bdc821a207eafc58fe783086511001f40262b9c7175e30f8a17078a23af4e1ea1f79d18a1558650b1ab3
-  data.tar.gz: 869170f02d04650f64beefa7cc616189420575ceb497ba7ae97b3970f635ce29c1c555bc66bc1157831cfc02f9dc6c4bf97c99b3097c8a1ae2da5b883f2363e6
+  metadata.gz: 3daace9c9b8bced32115713766b9d5d171210b32ba5ad0969a73c3e3ee77d18be31b3a0d15daa3061870b1954a751462f7d9bf1f048de427e86fad9c13c9dc21
+  data.tar.gz: 595718d2f8de2b35468b016742c96d32cb037aa0498bba29b45d8994cb09c22aad9686255728bd7a4745363f60e911b5c71d59265d48484407bd177510a0c3c1

data/app/controllers/accountability/order_groups_controller.rb

@@ -55,6 +55,16 @@ module Accountability
       end
     end
 
+    def checkout
+      @order_group.assign_account!(helpers.current_account) if @order_group.unassigned?
+
+      if @order_group.checkout!
+        redirect_to after_checkout_path(@order_group), notice: 'Checkout complete'
+      else
+        redirect_back fallback_location: accountability_order_group_path(@order_group), alert: 'Failed to check out'
+      end
+    end
+
     private
 
     def set_order_group
@@ -64,5 +74,9 @@ module Accountability
     def order_group_params
       params.require(:order_group).permit
     end
+
+    def after_checkout_path(_order_group)
+      accountability_order_groups_path
+    end
   end
 end

data/app/models/accountability/account.rb

@@ -13,6 +13,7 @@ module Accountability
     has_many :credits, dependent: :destroy
     has_many :debits, dependent: :destroy
     has_many :billing_configurations, dependent: :destroy
+    has_one :primary_billing_configuration, -> { order(primary: :desc) }, class_name: 'BillingConfiguration', inverse_of: :account
 
     enum statement_schedule: %i[end_of_month bi_weekly]
 

data/app/models/accountability/application_record.rb

@@ -12,6 +12,10 @@ class Accountability::ApplicationRecord < ActiveRecord::Base
 
   def validate_validatable_attributes
     validatable_attribute_names.each do |attribute_name|
+      # This is a fragile, temporary patch for an issue caused by the misuse of class attributes.
+      # TODO: Rework validatable_attributes with isolated variable scope
+      next unless self.respond_to? attribute_name
+
       attribute = public_send attribute_name
 
       next if attribute.blank?

data/app/models/accountability/order_group.rb

@@ -29,6 +29,10 @@ module Accountability
       order_items.each(&:accrue_credit!)
     end
 
+    def raw_total
+      order_items.sum(&:default_price)
+    end
+
     # The `product` parameter accepts Product, String, and Integer objects
     def add_item!(product, source_scope: nil)
       product = Product.find(product) unless product.is_a? Product

data/app/models/accountability/order_item.rb

@@ -51,7 +51,9 @@ class Accountability::OrderItem < ApplicationRecord
   end
 
   def default_price
-    price_override&.price || product.price
+    return price_override.price if price_override.present?
+
+    product.price
   end
 
   def price_override

data/lib/accountability/rails/routes.rb

@@ -37,7 +37,10 @@ module ActionDispatch::Routing
         resources :products, controller: options.dig(:controllers, :products), path: options.dig(:routes, :products)
 
         resources :order_groups, controller: options.dig(:controllers, :order_groups), path: options.dig(:routes, :order_groups) do
-          member { post :add_item }
+          member do
+            post :add_item
+            put :checkout
+          end
         end
       end
 

data/lib/accountability/version.rb

@@ -1,3 +1,3 @@
 module Accountability
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: accountability
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Joshua Stowers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_accountability_merchant