effective_orders 6.18.4 → 6.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d30ecbd0854168592005b06f14661ded4e48e61a8b4b4a181e652c0c3826cbc
-  data.tar.gz: 42506cd1c6268406fa3e7cb8802799905d5e10fc0ace73fd4982c7f8500cb9de
+  metadata.gz: fe4877e8b611ca4cf5aae18c2f43d0e62a6dc333e76634c74d098efe952199b6
+  data.tar.gz: 7fdb4b4fda03ea47a941a032ee320fff2a6f432fd452e596bb2cfae40ed04569
 SHA512:
-  metadata.gz: bc88b76583abd395fda539b6a237218f3e625fc88f83c878b0d0d71e114a2002c701aaf574bee9cc179a15fd6d24a9291a642bf66c407c8e729a5783a4fc0595
-  data.tar.gz: 215adf0b221c134a2925c52ed4312ed1daec375cd0977db3a82464fe35e7bc9dff5c16e613c635faf7191a42398c856a3d9b72eb3cba5ea2085525377109a5d6
+  metadata.gz: 35d1d862fc154790c9e03ab1e01cd679340ae2c6da181cb26c6206fbaa6d6e3d1788e2b98516ba204e4e575ad98b12331ce81db0c41f5883fab3ca6ce99d1c70
+  data.tar.gz: 468b756bce436cacd7e9132d126edff379f61991dc984cc1ac140dec93750459caa379aedd184c9c5f846770d2566ecf16639c0f2980baa7557acf8746e72c63

data/app/controllers/admin/item_names_controller.rb

@@ -0,0 +1,13 @@
+module Admin
+  class ItemNamesController < ApplicationController
+    before_action(:authenticate_user!) if defined?(Devise)
+    before_action { EffectiveResources.authorize!(self, :admin, :effective_orders) }
+
+    include Effective::CrudController
+
+    if (config = EffectiveOrders.layout)
+      layout(config.kind_of?(Hash) ? config[:admin] : config)
+    end
+
+  end
+end

data/app/datatables/admin/effective_item_names_datatable.rb

@@ -0,0 +1,22 @@
+module Admin
+  class EffectiveItemNamesDatatable < Effective::Datatable
+    filters do
+      scope :unarchived, label: 'All'
+      scope :archived
+    end
+
+    datatable do
+      order :name
+
+      col :id, visible: false
+      col :name
+      col :archived, visible: false
+
+      actions_col
+    end
+
+    collection do
+      Effective::ItemName.all
+    end
+  end
+end

data/app/helpers/effective_acts_as_purchasable_helper.rb

@@ -0,0 +1,25 @@
+module EffectiveActsAsPurchasableHelper
+  def acts_as_purchasable_fields(form, options = {})
+    raise 'expected a form builder' unless form.respond_to?(:object)
+    render('effective/acts_as_purchasable/fields', { form: form }.merge(options))
+  end
+
+  def qb_item_name_field(form, options = {})
+    raise 'expected a form builder' unless form.respond_to?(:object)
+    raise 'expected an object that responds to qb_item_name' unless form.object.respond_to?(:qb_item_name)
+
+    collection = Effective::ItemName.unarchived.or(Effective::ItemName.where(name: form.object.qb_item_name.to_s)).sorted.pluck(:name)
+
+    options = options.reverse_merge(
+      label: (EffectiveOrders.quickbooks? ? "Quickbooks #{etd(Effective::ItemName)}" : et(Effective::ItemName)),
+      hint: "Can't find the #{etd(Effective::ItemName)} you need? #{link_to('Click here to add one', effective_orders.admin_item_names_path, target: '_blank')}"
+    )
+    
+    form.select :qb_item_name, collection, options
+  end
+
+  # This is called on the My Sales Page and is intended to be overridden in the app if needed
+  def acts_as_purchasable_path(purchasable, action = :show)
+    polymorphic_path(purchasable)
+  end
+end

data/app/helpers/effective_orders_helper.rb

@@ -71,11 +71,6 @@ module EffectiveOrdersHelper
     end
   end
 
-  # This is called on the My Sales Page and is intended to be overridden in the app if needed
-  def acts_as_purchasable_path(purchasable, action = :show)
-    polymorphic_path(purchasable)
-  end
-
   def order_payment_to_html(order)
     content_tag(:pre) do
       raw JSON.pretty_generate(order.payment).html_safe.gsub('\"', '').gsub("[\n\n    ]", '[]').gsub("{\n    }", '{}')

data/app/models/effective/item_name.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+#
+# This is a CRUD model to populate the select field to choose qb_item_name on acts_as_purchasable objects.
+
+module Effective
+  class ItemName < ActiveRecord::Base
+    self.table_name = (EffectiveOrders.item_names_table_name || :item_names).to_s
+
+    acts_as_archived
+    log_changes if respond_to?(:log_changes)
+
+    effective_resource do
+      name       :string
+      archived   :boolean
+
+      timestamps
+    end
+
+    scope :sorted, -> { order(:name) }
+
+    validates :name, uniqueness: true, presence: true
+
+    def to_s
+      name.presence || model_name.human
+    end
+
+  end
+end

data/app/models/effective/order.rb

@@ -810,7 +810,7 @@ module Effective
 
       # Went from delayed to cheque
       if delayed_payment? && !delayed_payment_provider?
-        assign_attributes(delayed_payment: false, delayed_payment_date: nil, delayed_payment_intent: nil, delayed_payment_total: nil)
+        assign_attributes(delayed_payment_intent: nil, delayed_payment_total: nil)
       end
 
       if current_user&.email.present?

data/app/models/effective/order_item.rb

@@ -90,7 +90,7 @@ module Effective
     # first or build
     def qb_item_name
       raise('expected Effective Quickbooks gem') unless defined?(EffectiveQbSync) || defined?(EffectiveQbOnline)
-      (qb_order_item || build_qb_order_item(name: purchasable&.qb_item_name)).name
+      (qb_order_item || build_qb_order_item(name: purchasable.try(:qb_item_name))).name
     end
 
   end

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

@@ -0,0 +1,7 @@
+= tabs do
+  = tab(item_name) do
+    = render '/admin/item_names/form_item_name', item_name: item_name
+
+  - if item_name.persisted?
+    = tab('Logs') do
+      = render_datatable(item_name.log_changes_datatable, inline: true, namespace: :admin)

data/app/views/admin/item_names/_form_item_name.html.haml

@@ -0,0 +1,4 @@
+= effective_form_with(model: [:admin, item_name], engine: true) do |f|
+  = f.text_field :name
+  = f.check_box :archived, label: "Yes, this #{etd(f.object)} is archived. It will not be displayed."
+  = effective_submit(f)

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

@@ -13,7 +13,7 @@
 
     .col= pf.price_field :price
 
-    - if EffectiveOrders.qb_sync? || EffectiveOrders.qb_online?
-      .col= pf.text_field :qb_item_name, label: 'Quickbooks Item'
+    .col
+      .mt-4= qb_item_name_field(pf)
 
     .col= pf.check_box :tax_exempt, label: "Tax Exempt", title: 'When checked, tax will not be applied to this item'

data/app/views/effective/acts_as_purchasable/_fields.html.haml

@@ -0,0 +1,3 @@
+= form.price_field :price
+= qb_item_name_field(form)
+= form.check_box :tax_exempt, label: "Yes, this #{etd(form.object)} is tax exempt"

data/app/views/effective/orders/deferred.html.haml

@@ -2,9 +2,26 @@
   %h1.effective-heading= @page_title
 
   %p.effective-orders-page-content
-    You have indicated that this order will be paid by #{@order.payment_provider}.
-    Your order will not be considered purchased until we receive your payment.
-    Please contact us at your earliest convenience.
+    - if @order.delayed? && @order.deferred? && @order.delayed_payment_provider?
+      %p 
+        = succeed('.') do
+          - distance = distance_of_time_in_words(Time.zone.now, @order.delayed_payment_date.beginning_of_day)
+
+          The payment date for this order
+
+          - if @order.delayed_payment_date_upcoming?
+            is in #{distance} from now on #{@order.delayed_payment_date.strftime('%F')}
+          - elsif @order.delayed_payment_date_today?
+            was today
+          - else
+            was #{distance} ago on #{@order.delayed_payment_date.strftime('%F')}
+
+      %p Your existing #{@order.delayed_payment_method} will be charged on the payment date.
+
+    - elsif @order.deferred?
+      You have indicated that this order will be paid by #{@order.payment_provider}.
+      Your order will not be considered purchased until we receive your payment.
+      Please contact us at your earliest convenience.
 
   = render @order
 

data/config/routes.rb

@@ -1,4 +1,6 @@
 EffectiveOrders::Engine.routes.draw do
+  acts_as_archived
+
   scope module: 'effective' do
     resources :orders, except: [:destroy] do
       member do
@@ -49,6 +51,7 @@ EffectiveOrders::Engine.routes.draw do
 
   namespace :admin do
     resources :customers, only: [:index, :show]
+    resources :item_names, except: [:show, :destroy], concerns: :acts_as_archived
 
     resources :orders do
       member do

data/db/migrate/101_create_effective_orders.rb

@@ -110,6 +110,16 @@ class CreateEffectiveOrders < ActiveRecord::Migration[6.0]
 
     add_index :customers, :user_id
 
+    create_table :item_names do |t|
+      t.string :name
+      t.boolean :archived, default: false
+
+      t.datetime :updated_at
+      t.datetime :created_at
+    end
+
+    add_index :item_names, [:name, :archived]
+
     create_table :subscriptions do |t|
       t.integer   :customer_id
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '6.18.4'.freeze
+  VERSION = '6.19.1'.freeze
 end

data/lib/effective_orders.rb

@@ -16,7 +16,7 @@ module EffectiveOrders
   def self.config_keys
     [
       :orders_table_name, :order_items_table_name, :carts_table_name, :cart_items_table_name,
-      :customers_table_name, :subscriptions_table_name, :products_table_name,
+      :customers_table_name, :subscriptions_table_name, :products_table_name, :item_names_table_name,
       :layout,
       :orders_collection_scope, :order_tax_rate_method,
       :obfuscate_order_ids, :use_effective_qb_sync, :use_effective_qb_online,
@@ -212,6 +212,10 @@ module EffectiveOrders
     use_effective_qb_online && defined?(EffectiveQbOnline)
   end
 
+  def self.quickbooks?
+    use_effective_qb_sync || use_effective_qb_online
+  end
+
   def self.surcharge?
     credit_card_surcharge_percent.to_f > 0.0
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 6.18.4
+  version: 6.19.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-15 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -202,6 +202,7 @@ files:
 - app/assets/stylesheets/effective_orders/_cart.scss
 - app/assets/stylesheets/effective_orders/_order.scss
 - app/controllers/admin/customers_controller.rb
+- app/controllers/admin/item_names_controller.rb
 - app/controllers/admin/order_items_controller.rb
 - app/controllers/admin/order_reports_controller.rb
 - app/controllers/admin/orders_controller.rb
@@ -226,12 +227,14 @@ files:
 - app/controllers/effective/subscripter_controller.rb
 - app/controllers/effective/webhooks_controller.rb
 - app/datatables/admin/effective_customers_datatable.rb
+- app/datatables/admin/effective_item_names_datatable.rb
 - app/datatables/admin/effective_orders_datatable.rb
 - app/datatables/admin/report_payment_providers_datatable.rb
 - app/datatables/admin/report_transactions_datatable.rb
 - app/datatables/admin/report_transactions_grouped_by_name_datatable.rb
 - app/datatables/admin/report_transactions_grouped_by_qb_name_datatable.rb
 - app/datatables/effective_orders_datatable.rb
+- app/helpers/effective_acts_as_purchasable_helper.rb
 - app/helpers/effective_carts_helper.rb
 - app/helpers/effective_deluxe_delayed_helper.rb
 - app/helpers/effective_deluxe_helper.rb
@@ -249,6 +252,7 @@ files:
 - app/models/effective/cart_item.rb
 - app/models/effective/customer.rb
 - app/models/effective/deluxe_api.rb
+- app/models/effective/item_name.rb
 - app/models/effective/order.rb
 - app/models/effective/order_item.rb
 - app/models/effective/product.rb
@@ -259,6 +263,8 @@ files:
 - app/views/admin/customers/_actions.html.haml
 - app/views/admin/customers/index.html.haml
 - app/views/admin/customers/show.html.haml
+- app/views/admin/item_names/_form.html.haml
+- app/views/admin/item_names/_form_item_name.html.haml
 - app/views/admin/order_items/index.html.haml
 - app/views/admin/order_reports/index.html.haml
 - app/views/admin/orders/_form.html.haml
@@ -269,6 +275,7 @@ files:
 - app/views/admin/orders/_order_actions.html.haml
 - app/views/admin/orders/_order_item_fields.html.haml
 - app/views/admin/orders/checkout.html.haml
+- app/views/effective/acts_as_purchasable/_fields.html.haml
 - app/views/effective/carts/_cart.html.haml
 - app/views/effective/carts/_cart_actions.html.haml
 - app/views/effective/carts/show.html.haml