effective_orders 4.0.0beta3 → 4.0.0beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41a725b2c451424ab930ca84057bfa76d9404a14
-  data.tar.gz: 90b4af7a1be8ad14966a6449b14620271677bb1f
+  metadata.gz: c4c93ba62efdec37fd8c277afca2a28090303b8c
+  data.tar.gz: 8e89c28503192d4373aca8b13762ab8fede41744
 SHA512:
-  metadata.gz: ca7e090b0167792643e3a9d56d4c25d1127e30a7fa84a33df06c96c762a832633aefed1fca2074b37cc28511a1159ad4880f5a09b1501e1e76884c0028269ad7
-  data.tar.gz: a0cd6b57b48f61aef840cdff2339bac7ec5ff9bf5cf0846121535ffb88e719d30a0f4436eed781e7ca44ab2deeb298b7e5c0df3d8a850a6b6ee9d1e6dbecdc10
+  metadata.gz: 5013c1845227a4117f94eb1a7f414b0fa048ecf8e617da3dd82eee2ad16326246edc726877eb898ba0b97ccc739f8909373126d4b1162cb122f393a68bbc0ee3
+  data.tar.gz: 51328fba62557431d4ed163a67bb9c61996cb38cff150fb8706c9398b55aef69139b1264bcd1dac3028dba64583bf5833f4daa7695ca6a56d519566404d38d81

data/app/helpers/effective_orders_helper.rb

@@ -47,7 +47,7 @@ module EffectiveOrdersHelper
     when :paypal
       'Checkout with PayPal'
     when :pretend
-      EffectiveOrders.pretend_purchase_in_production_enabled ? 'Purchase Order' : 'Purchase Order (development only)'
+      'Purchase Order (skip payment processor)'
     when :refund
       'Complete Refund'
     when :stripe

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

@@ -30,10 +30,8 @@
       - if EffectiveOrders.cheque? && order.user == current_user
         = render partial: '/effective/orders/cheque/form', locals: provider_locals
 
-    - if EffectiveOrders.pretend? && Rails.env.production? && EffectiveOrders.pretend_purchase_in_production_message.present?
-      %br
-      %p= EffectiveOrders.pretend_purchase_in_production_message
-
+  - if EffectiveOrders.pretend? && EffectiveOrders.pretend_message.present?
+    %p.text-right= EffectiveOrders.pretend_message
 
   - if EffectiveOrders.authorized?(controller, :admin, :effective_orders) && order.user != current_user
     - if EffectiveOrders.refunds? && order.refund?

data/config/effective_orders.rb

@@ -103,23 +103,13 @@ EffectiveOrders.setup do |config|
   # Refunds don't perform any kind of refund action with the payment processor. This just changes the validations.
   config.refunds_enabled = false
 
-  # Pretend Purchase in Development
+  # Pretend Purchase
   # Display a 'Purchase order' button on the Checkout screen allowing the user
-  # to purchase an Order without going through the payment processor. Works in !Rails.env.production?
-  config.pretend_purchase_in_development_enabled = true
-
-  # Pretend Purchase in Production
+  # to purchase an Order without going through the payment processor.
   # WARNING: Setting this option to true will allow users to purchase! an Order without entering a credit card
   # WARNING: When true, users can purchase! anything without paying money
-  #
-  # This should basically always be false, but sometimes you want to make a Beta/Demo site
-  # where users may test the purchase workflow without actually paying money
-  #
-  # When true, there will be a 'Process Order' button on the Checkout screen.
-  # Clicking this button will mark an Order purchased and redirect the user to the
-  # Thank You page just as if they had successfully Checked Out through a payment processor
-  config.pretend_purchase_in_production_enabled = false
-  config.pretend_purchase_in_production_message = '* payment information is not required to process this order at this time.'
+  config.pretend_enabled = !Rails.env.production?
+  config.pretend_message = '* payment information is not required to process this order at this time.'
 
   # Mailer Settings
   # effective_orders will send out receipts to the buyer, seller and admins.

data/lib/effective_orders.rb

@@ -21,10 +21,6 @@ module EffectiveOrders
 
   mattr_accessor :authorization_method
 
-  mattr_accessor :pretend_purchase_in_development_enabled
-  mattr_accessor :pretend_purchase_in_production_enabled
-  mattr_accessor :pretend_purchase_in_production_message
-
   mattr_accessor :layout
   mattr_accessor :mailer
 
@@ -47,9 +43,13 @@ module EffectiveOrders
   mattr_accessor :terms_and_conditions_label
 
   mattr_accessor :minimum_charge
+
+  # Features
   mattr_accessor :free_enabled
   mattr_accessor :mark_as_paid_enabled
   mattr_accessor :refunds_enabled
+  mattr_accessor :pretend_enabled
+  mattr_accessor :pretend_message
 
   # Payment processors. false or Hash
   mattr_accessor :cheque
@@ -110,7 +110,7 @@ module EffectiveOrders
   end
 
   def self.pretend?
-    (pretend_purchase_in_production_enabled && Rails.env.production?) || (pretend_purchase_in_development_enabled && !Rails.env.production?)
+    pretend_enabled == true
   end
 
   def self.refunds?

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.0.0beta3'.freeze
+  VERSION = '4.0.0beta4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.0.0beta3
+  version: 4.0.0beta4
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails