effective_orders 4.4.3 → 4.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53a918aa7baad340d52b29cbee1606af5d82f823dc4f66ba94463e697f8beeb6
-  data.tar.gz: f27dd98180e0cc5d01ec02bbb9a693ec16b01c1874aae1f7f050b8aaf8631e0f
+  metadata.gz: f1c9cb84422232f69446f9612ffa08cebcdc62b85430377f42a7da21c716d10e
+  data.tar.gz: c72f1703bc93f608862bd55b093fb3fe0d2e239b5030ab43ccd90df616c7ed89
 SHA512:
-  metadata.gz: 79cc98eaa1bc9dc98d267e61f30045acaf2e7a4b70119706d93559b4afbf49018bb4d5161a6dc38a1fa9626815557589d57d8fb36b7710e3d02827de5be5c8ae
-  data.tar.gz: dc79e38e4cbfa81a1feb580dc18fbaf0dab4da8f212c659332be24acc19f08228541ea48fac35e2a2fd60e8fc2004bb589933b971af1ca98a568d277332d3839
+  metadata.gz: e28e1ffc282e08b81a2f85407fb084d4117ed0744a55f7b85e78c1dbe62711f04c80d6aee7cc814e4b1ef167edf4d21da88232a1b07023dc6af2f8ec8af1bce2
+  data.tar.gz: ed68a2d78bcae4af39223adb8ec445f9d7ccbc61a891717018e166021fa0f5f9ed193aba08c265cc998335438acf05b58f3619d82529233530e366488493d60e

data/app/controllers/admin/orders_controller.rb

@@ -43,7 +43,7 @@ module Admin
           @order.pending!
 
           message = 'Successfully created order'
-          message << ". A request for payment has been sent to #{@order.user.email}" if @order.send_payment_request_to_buyer?
+          message << ". A request for payment has been sent to #{@order.emails_send_to}" if @order.send_payment_request_to_buyer?
           flash[:success] = message
 
           redirect_to(admin_redirect_path) and return
@@ -149,7 +149,7 @@ module Admin
       authorize_effective_order!
 
       if @order.send_payment_request_to_buyer!
-        flash[:success] = "A request for payment has been sent to #{@order.user.email}"
+        flash[:success] = "A request for payment has been sent to #{@order.emails_send_to}"
       else
         flash[:danger] = 'Unable to send payment request'
       end
@@ -179,8 +179,8 @@ module Admin
     private
 
     def order_params
-      params.require(:effective_order).permit(:user_id, :send_payment_request_to_buyer,
-        :note_internal, :note_to_buyer,
+      params.require(:effective_order).permit(:user_id, :cc,
+        :send_payment_request_to_buyer, :note_internal, :note_to_buyer,
         :payment_provider, :payment_card, :payment, :send_mark_as_paid_email_to_buyer,
         order_items_attributes: [
           :quantity, :_destroy, purchasable_attributes: [

data/app/controllers/effective/concerns/purchase.rb

@@ -13,7 +13,7 @@ module Effective
 
           if flash[:success].blank?
             if EffectiveOrders.mailer[:send_order_receipt_to_buyer] && email
-              flash[:success] = "Payment successful! A receipt has been sent to #{@order.user.email}"
+              flash[:success] = "Payment successful! A receipt has been sent to #{@order.emails_send_to}"
             else
               flash[:success] = "Payment successful! An email receipt has not been sent."
             end
@@ -36,7 +36,7 @@ module Effective
 
         if flash[:success].blank?
           if email
-            flash[:success] = "Deferred payment created! A request for payment has been sent to #{@order.user.email}"
+            flash[:success] = "Deferred payment created! A request for payment has been sent to #{@order.emails_send_to}"
           else
             flash[:success] = "Deferred payment created!"
           end

data/app/controllers/effective/orders_controller.rb

@@ -110,7 +110,7 @@ module Effective
       EffectiveOrders.authorize!(self, :show, @order)
 
       if @order.send_order_receipt_to_buyer!
-        flash[:success] = "A receipt has been sent to #{@order.user.email}"
+        flash[:success] = "A receipt has been sent to #{@order.emails_send_to}"
       else
         flash[:danger] = "Unable to send receipt."
       end

data/app/datatables/admin/effective_orders_datatable.rb

@@ -39,10 +39,12 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
 
     if attributes[:user_id].blank?
       col :user
-      col 'user.email', visible: false
       col :billing_name, visible: false
+      col :email, visible: false
     end
 
+    col :cc, visible: false
+
     if EffectiveOrders.billing_address
       col :billing_address, visible: false
     end
@@ -86,8 +88,6 @@ class Admin::EffectiveOrdersDatatable < Effective::Datatable
 
     if attributes[:user_id].present?
       scope = scope.where(user: user)
-    else
-      scope = scope.joins(:user)
     end
 
     scope

data/app/mailers/effective/orders_mailer.rb

@@ -24,7 +24,7 @@ module Effective
 
       @subject = subject_for(@order, :order_receipt_to_buyer, "Order Receipt: ##{@order.to_param}")
 
-      mail(to: @order.user.email, subject: @subject)
+      mail(to: @order.email, cc: @order.cc, subject: @subject)
     end
 
     # This is sent when an admin creates a new order or /admin/orders/new
@@ -38,7 +38,7 @@ module Effective
 
       @subject = subject_for(@order, :payment_request_to_buyer, "Request for Payment: Invoice ##{@order.to_param}")
 
-      mail(to: @order.user.email, subject: @subject)
+      mail(to: @order.email, cc: @order.cc, subject: @subject)
     end
 
     # This is sent when someone chooses to Pay by Cheque
@@ -50,7 +50,7 @@ module Effective
 
       @subject = subject_for(@order, :pending_order_invoice_to_buyer, "Pending Order: ##{@order.to_param}")
 
-      mail(to: @order.user.email, subject: @subject)
+      mail(to: @order.email, cc: @order.cc, subject: @subject)
     end
 
     # This is sent to admin when someone Accepts Refund

data/app/models/effective/order.rb

@@ -42,9 +42,11 @@ module Effective
     # note_to_buyer     :text   # From admin to buyer
     # note_internal     :text   # Internal admin only
     #
-    # billing_name      :string # name of buyer
-    # payment           :text   # serialized hash containing all the payment details.
+    # billing_name      :string   # name of buyer
+    # email             :string   # same as user.email
+    # cc                :string   # can be set by admin
     #
+    # payment           :text     # serialized hash containing all the payment details.
     # payment_provider  :string
     # payment_card      :string
     #
@@ -60,6 +62,7 @@ module Effective
 
     before_validation { assign_order_totals }
     before_validation { assign_billing_name }
+    before_validation { assign_email }
     before_validation { assign_last_address }
 
     before_validation(if: -> { confirmed_checkout }) do
@@ -68,6 +71,9 @@ module Effective
 
     # Order validations
     validates :user_id, presence: true
+    validates :email, presence: true, email: true  # email and cc validators are from effective_resources
+    validates :cc, email_cc: true
+
     validates :order_items, presence: { message: 'No items are present. Please add additional items.' }
     validates :state, inclusion: { in: EffectiveOrders::STATES.keys }
     validates :subtotal, presence: true
@@ -411,6 +417,11 @@ module Effective
       true
     end
 
+    # Doesn't control anything. Purely for the flash messaging
+    def emails_send_to
+      [email, cc.presence].compact.to_sentence
+    end
+
     def send_order_receipts!
       send_order_receipt_to_admin! if EffectiveOrders.mailer[:send_order_receipt_to_admin]
       send_order_receipt_to_buyer! if EffectiveOrders.mailer[:send_order_receipt_to_buyer]
@@ -470,6 +481,10 @@ module Effective
       self.billing_name = [(billing_address.full_name.presence if billing_address.present?), (user.to_s.presence)].compact.first
     end
 
+    def assign_email
+      self.email = user&.email
+    end
+
     def assign_last_address
       return unless user.present?
       return unless (EffectiveOrders.billing_address || EffectiveOrders.shipping_address)

data/app/models/effective/order_item.rb

@@ -20,8 +20,8 @@ module Effective
     validates :price, presence: true
     validates :tax_exempt, inclusion: { in: [true, false] }
 
-    scope :sold, -> { joins(:order).where(orders: { state: EffectiveOrders::PURCHASED }) }
-    scope :sold_by, lambda { |user| sold().where(seller_id: user.id) }
+    scope :purchased, -> { where(order_id: Effective::Order.purchased) }
+    scope :purchased_by, lambda { |user| where(order_id: Effective::Order.purchased_by(user)) }
 
     def to_s
       (quantity || 0) > 1 ? "#{quantity}x #{name}" : name

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

@@ -6,11 +6,11 @@
 
   - if order.purchased?
     = dropdown_link_to 'Email receipt to buyer', effective_orders.send_buyer_receipt_order_path(order),
-      data: { confirm: "Send receipt to #{order.user.email}?" }
+      data: { confirm: "Send receipt to #{order.emails_send_to}?" }
 
   - if order.pending? || order.confirmed? || order.deferred?
     = dropdown_link_to 'Email request for payment to buyer', effective_orders.send_payment_request_admin_order_path(order),
-      data: { method: :post, confirm: "Send request for payment to #{order.user.email}?" }
+      data: { method: :post, confirm: "Send request for payment to #{order.emails_send_to}?" }
 
     = dropdown_link_to 'Admin: Checkout', effective_orders.checkout_admin_order_path(order)
 

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

@@ -1,20 +1,24 @@
 = effective_form_with(model: [:admin, order], url: (order.persisted? ? effective_orders.admin_order_path(order) : effective_orders.admin_orders_path)) do |f|
   - if f.object.new_record?
-    = f.select :user_id, @users || User.all.to_a.sort { |user1, user2| user1.to_s <=> user2.to_s }, label: 'Buyer', required: true
+    = f.select :user_id, @users || User.all.to_a.sort { |user1, user2| user1.to_s <=> user2.to_s },
+      label: 'Buyer', required: true, hint: 'The user that should purchase this order.'
+
+    = f.cc_field :cc, hint: "Cc the above on any emailed receipts or payment requests."
 
     %h2 Order Items
     .order_items
       - f.object.order_items.build unless f.object.order_items.present?
+
       = f.fields_for :order_items, f.object.order_items do |order_item|
         = render 'order_item_fields', f: order_item
 
       .links
-        = link_to_add_association "Add line item".html_safe, f, :order_items, class: 'btn btn-success', partial: 'order_item_fields'
+        = link_to_add_association (icon('plus') + 'Add item'), f, :order_items, class: 'btn btn-secondary', partial: 'order_item_fields'
 
     %hr
 
     = f.check_box :send_payment_request_to_buyer,
-      label: 'Yes, send a payment request email to the buyer.',
+      label: 'Yes, send a payment request email to the buyer and any cc.',
       value: (f.object.send_payment_request_to_buyer.nil? ? EffectiveOrders.mailer[:send_payment_request_to_buyer] : f.object.send_payment_request_to_buyer?)
 
   .row

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

@@ -1,7 +1,7 @@
 .nested-fields.order-item
   .row.align-items-center
     = f.fields_for :purchasable, (f.object.purchasable || Effective::Product.new) do |pf|
-      .col-md-1= f.number_field :quantity, input_html: { value: f.object.quantity || 1, min: 1 }
+      .col-md-2= f.number_field :quantity, input_html: { value: f.object.quantity || 1, min: 1 }
       .col-md-4= pf.text_field :name, maxlength: 255
       .col-md-2= pf.price_field :price
 
@@ -9,6 +9,6 @@
         .col-md-2= pf.text_field :qb_item_name, maxlength: 255, label: 'Quickbooks Item'
 
       .col-md-2.mt-4= pf.check_box :tax_exempt, label: "Tax Exempt", title: 'When checked, tax will not be applied to this item'
-      .col-md-1.mt-4
-        = link_to_remove_association(f, 'data-confirm': 'Really remove this item?') do
-          = icon('x', class: 'btn-danger')
+      .col-md-1
+        = link_to_remove_association(f, 'data-confirm': 'Remove?') do
+          = icon('trash-2', class: 'text-danger')

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

@@ -5,13 +5,13 @@
   - if order.purchased?
     = link_to 'Email receipt to buyer', effective_orders.send_buyer_receipt_order_path(order),
       class: 'btn btn-secondary',
-      data: { confirm: "Send receipt to #{order.user.email}?" }
+      data: { confirm: "Send receipt to #{order.emails_send_to}?" }
 
   - if order.persisted? && EffectiveOrders.authorized?(controller, :admin, :effective_orders)
     - if order.pending? || order.confirmed? || order.deferred?
       = link_to 'Email request for payment to buyer', effective_orders.send_payment_request_admin_order_path(order),
         class: 'btn btn-secondary',
-        data: { method: :post, confirm: "Send request for payment to #{order.user.email}?" }
+        data: { method: :post, confirm: "Send request for payment to #{order.emails_send_to}?" }
 
       = link_to 'Delete', effective_orders.admin_order_path(order),
         class: 'btn btn-danger',

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

@@ -14,8 +14,16 @@
             %br
 
           - if order.billing_address.present?
-            = render partial: 'effective/addresses/address',
-              locals: { address: order.billing_address, email: order.user.email }
+            = render partial: 'effective/addresses/address', locals: { address: order.billing_address }
+            %br
+
+          = mail_to(order.email)
+
+          - if order.cc.present?
+            %br
+            Cc:
+            - order.cc.split(',').each do |email|
+              = mail_to(email)
 
         - if order.shipping_address.present?
           %td

data/app/views/effective/orders_mailer/refund_notification_to_admin.html.haml

@@ -7,7 +7,7 @@
   = price_to_currency(@order.total)
   to
   = @order.billing_name
-  = @order.user.email
+  = @order.email
 
 
 %p Thanks and have a great day!

data/db/migrate/01_create_effective_orders.rb.erb

@@ -10,8 +10,10 @@ class CreateEffectiveOrders < ActiveRecord::Migration[4.2]
       t.text      :note_internal
 
       t.string    :billing_name
-      t.text      :payment
+      t.string    :email
+      t.string    :cc
 
+      t.text      :payment
       t.string    :payment_provider
       t.string    :payment_card
 

data/lib/effective_orders.rb

@@ -88,7 +88,7 @@ module EffectiveOrders
 
   def self.permitted_params
     [
-      :note, :terms_and_conditions, :confirmed_checkout,
+      :cc, :note, :terms_and_conditions, :confirmed_checkout,
       billing_address: EffectiveAddresses.permitted_params,
       shipping_address: EffectiveAddresses.permitted_params,
       subscripter: [:stripe_plan_id, :stripe_token]

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.4.3'.freeze
+  VERSION = '4.4.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.4.3
+  version: 4.4.4
 platform: ruby
 authors:
 - Code and Effect