effective_orders 3.2.3 → 4.0.0beta1

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '3.2.3'.freeze
+  VERSION = '4.0.0beta1'.freeze
 end

data/lib/generators/templates/effective_orders_mailer_preview.rb

@@ -68,10 +68,10 @@ class EffectiveOrdersMailerPreview < ActionMailer::Preview
   # so that this mailer will not have to guess at your app's acts_as_purchasable objects
   def preview_order_items
     [
-      {title: 'Item One', quantity: 2, price: 999, tax_exempt: false},
-      {title: 'Item Two', quantity: 1, price: 25000, tax_exempt: false},
-      {title: 'Item Three', quantity: 1, price: 8999, tax_exempt: false},
-      {title: 'Item Four', quantity: 1, price: 100000, tax_exempt: false}
+      { title: 'Item One', quantity: 2, price: 999, tax_exempt: false },
+      { title: 'Item Two', quantity: 1, price: 25000, tax_exempt: false },
+      { title: 'Item Three', quantity: 1, price: 8999, tax_exempt: false },
+      { title: 'Item Four', quantity: 1, price: 100000, tax_exempt: false }
     ]
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 4.0.0beta1
 platform: ruby
 authors:
 - Code and Effect
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-17 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: effective_datatables
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: effective_addresses
+  name: effective_bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: effective_datatables
+  name: effective_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 description: Quickly build an online store with carts, orders, automatic email receipts
   and payment collection via Stripe, StripeConnect, PayPal and Moneris.
 email:
@@ -118,14 +118,12 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
-- Rakefile
-- app/assets/config/effective_orders_manifest.js
-- app/assets/images/effective_orders/stripe_connect.png
 - app/assets/javascripts/effective_orders.js
 - app/assets/javascripts/effective_orders/customers.js.coffee
 - app/assets/javascripts/effective_orders/providers/stripe.js.coffee
 - app/assets/javascripts/effective_orders/subscriptions.js.coffee
 - app/assets/stylesheets/effective_orders.scss
+- app/assets/stylesheets/effective_orders/_cart.scss
 - app/assets/stylesheets/effective_orders/_order.scss
 - app/assets/stylesheets/effective_orders/_subscriptions.scss
 - app/controllers/admin/customers_controller.rb
@@ -135,8 +133,6 @@ files:
 - app/controllers/effective/concerns/purchase.rb
 - app/controllers/effective/customers_controller.rb
 - app/controllers/effective/orders_controller.rb
-- app/controllers/effective/providers/app_checkout.rb
-- app/controllers/effective/providers/ccbill.rb
 - app/controllers/effective/providers/cheque.rb
 - app/controllers/effective/providers/free.rb
 - app/controllers/effective/providers/mark_as_paid.rb
@@ -145,13 +141,11 @@ files:
 - app/controllers/effective/providers/pretend.rb
 - app/controllers/effective/providers/refund.rb
 - app/controllers/effective/providers/stripe.rb
-- app/controllers/effective/providers/stripe_connect.rb
 - app/controllers/effective/webhooks_controller.rb
 - app/datatables/effective_customers_datatable.rb
 - app/datatables/effective_order_items_datatable.rb
 - app/datatables/effective_orders_datatable.rb
 - app/helpers/effective_carts_helper.rb
-- app/helpers/effective_ccbill_helper.rb
 - app/helpers/effective_orders_helper.rb
 - app/helpers/effective_paypal_helper.rb
 - app/helpers/effective_stripe_helper.rb
@@ -167,13 +161,11 @@ files:
 - app/models/effective/order.rb
 - app/models/effective/order_item.rb
 - app/models/effective/product.rb
-- app/models/effective/providers/ccbill_postback.rb
-- app/models/effective/providers/moneris_charge.rb
 - app/models/effective/providers/stripe_charge.rb
-- app/models/effective/sold_out_validator.rb
 - app/models/effective/subscripter.rb
 - app/models/effective/subscription.rb
 - app/models/effective/tax_rate_calculator.rb
+- app/models/validators/effective/sold_out_validator.rb
 - app/views/admin/customers/_actions.html.haml
 - app/views/admin/customers/index.html.haml
 - app/views/admin/customers/show.html.haml
@@ -183,6 +175,7 @@ files:
 - app/views/admin/orders/_form_note_internal.html.haml
 - 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/admin/orders/edit.html.haml
 - app/views/admin/orders/index.html.haml
 - app/views/admin/orders/new.html.haml
@@ -194,6 +187,7 @@ files:
 - app/views/effective/customers/_fields.html.haml
 - app/views/effective/customers/_form.html.haml
 - app/views/effective/customers/edit.html.haml
+- app/views/effective/orders/_checkout_actions.html.haml
 - app/views/effective/orders/_checkout_step1.html.haml
 - app/views/effective/orders/_checkout_step2.html.haml
 - app/views/effective/orders/_order.html.haml
@@ -201,16 +195,13 @@ files:
 - app/views/effective/orders/_order_footer.html.haml
 - app/views/effective/orders/_order_header.html.haml
 - app/views/effective/orders/_order_items.html.haml
-- app/views/effective/orders/_order_note.html.haml
 - app/views/effective/orders/_order_note_fields.html.haml
-- app/views/effective/orders/_order_note_to_buyer.html.haml
+- app/views/effective/orders/_order_notes.html.haml
 - app/views/effective/orders/_order_payment_details.html.haml
 - app/views/effective/orders/_order_shipping.html.haml
 - app/views/effective/orders/_order_terms_and_conditions_fields.html.haml
 - app/views/effective/orders/_order_user_fields.html.haml
 - app/views/effective/orders/_orders_table.html.haml
-- app/views/effective/orders/app_checkout/_form.html.haml
-- app/views/effective/orders/ccbill/_form.html.haml
 - app/views/effective/orders/cheque/_form.html.haml
 - app/views/effective/orders/cheque/pay_by_cheque.html.haml
 - app/views/effective/orders/declined.html.haml
@@ -219,8 +210,6 @@ files:
 - app/views/effective/orders/index.html.haml
 - app/views/effective/orders/mark_as_paid/_form.html.haml
 - app/views/effective/orders/moneris/_form.html.haml
-- app/views/effective/orders/my_purchases.html.haml
-- app/views/effective/orders/my_sales.html.haml
 - app/views/effective/orders/new.html.haml
 - app/views/effective/orders/paypal/_form.html.haml
 - app/views/effective/orders/pretend/_form.html.haml
@@ -231,7 +220,6 @@ files:
 - app/views/effective/orders_mailer/order_error.html.haml
 - app/views/effective/orders_mailer/order_receipt_to_admin.html.haml
 - app/views/effective/orders_mailer/order_receipt_to_buyer.html.haml
-- app/views/effective/orders_mailer/order_receipt_to_seller.html.haml
 - app/views/effective/orders_mailer/payment_request_to_buyer.html.haml
 - app/views/effective/orders_mailer/pending_order_invoice_to_buyer.html.haml
 - app/views/effective/orders_mailer/subscription_canceled.html.haml
@@ -246,7 +234,6 @@ files:
 - config/routes.rb
 - db/migrate/01_create_effective_orders.rb.erb
 - lib/effective_orders.rb
-- lib/effective_orders/app_checkout_service.rb
 - lib/effective_orders/engine.rb
 - lib/effective_orders/version.rb
 - lib/generators/effective_orders/install_generator.rb
@@ -256,7 +243,7 @@ homepage: https://github.com/code-and-effect/effective_orders
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -267,12 +254,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5.1
+signing_key: 
 specification_version: 4
 summary: Quickly build an online store with carts, orders, automatic email receipts
   and payment collection via Stripe, StripeConnect, PayPal and Moneris.

data/Rakefile

@@ -1,21 +0,0 @@
-#!/usr/bin/env rake
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-# Testing tasks
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
-
-require "bundler/vendored_thor"
-Bundler::GemHelper.install_tasks
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
-
-task :default => :spec

data/app/assets/config/effective_orders_manifest.js

@@ -1,3 +0,0 @@
-//= link_directory ../javascripts .js
-//= link_directory ../stylesheets .css
-//= link_directory ../images/effective_orders

data/app/controllers/effective/providers/app_checkout.rb

@@ -1,38 +0,0 @@
-module Effective
-  module Providers
-    module AppCheckout
-      extend ActiveSupport::Concern
-
-      included do
-      end
-
-      # TODO: Make app checkout work with admin checkout workflow
-
-      def app_checkout
-        @order = Order.find(params[:id])
-
-        (EffectiveOrders.authorize!(self, :update, @order) rescue false)
-
-        checkout = EffectiveOrders.app_checkout[:service].call(order: @order)
-        if checkout.success?
-          order_purchased(details: payment_details(checkout), provider: 'app_checkout', card: 'none')
-        else
-          flash = EffectiveOrders.app_checkout[:declined_flash]
-          order_declined(details: payment_details(checkout), message: flash, provider: 'app_checkout', card: 'none')
-        end
-      end
-
-      private
-
-      def payment_details(checkout)
-        default = 'App Checkout'
-        if checkout.respond_to?(:payment_details)
-          checkout.payment_details.presence || default
-        else
-          default
-        end
-      end
-    end
-  end
-end
-

data/app/controllers/effective/providers/ccbill.rb

@@ -1,34 +0,0 @@
-module Effective
-  module Providers
-    module Ccbill
-      extend ActiveSupport::Concern
-
-      included do
-        skip_before_action :verify_authenticity_token, only: [:ccbill_postback]
-      end
-
-      # TODO: Make ccbill work with admin checkout workflow
-
-      def ccbill_postback
-        postback = Effective::Providers::CcbillPostback.new(params)
-        @order ||= Effective::Order.find(postback.order_id)
-
-        (EffectiveOrders.authorize!(self, :update, @order) rescue false)
-
-        if @order.present? && postback.verified?
-          if @order.purchased?
-            order_purchased(details: postback.order_details, provider: 'ccbill')
-          elsif postback.approval? && postback.matches?(@order)
-            order_purchased(details: postback.order_details, provider: 'ccbill')
-          else
-            order_declined(details: postback.order_details, provider: 'ccbill')
-          end
-        end
-
-        head(:ok)
-      end
-    end
-
-  end
-end
-

data/app/controllers/effective/providers/stripe_connect.rb

@@ -1,47 +0,0 @@
-module Effective
-  module Providers
-    module StripeConnect
-      extend ActiveSupport::Concern
-
-      included do
-        prepend_before_action :set_stripe_connect_state_params, only: [:stripe_connect_redirect_uri]
-      end
-
-      # So this is the postback after Stripe does its oAuth authentication
-      def stripe_connect_redirect_uri
-        if params[:code].present?
-          token_params = request_access_token(params[:code]) # We got a code, so now we make a curl request for the access_token
-          customer = Effective::Customer.for_user(current_user)
-
-          if token_params['access_token'].present? && customer.present?
-            if customer.update_attributes(stripe_connect_access_token: token_params['access_token'])
-              flash[:success] = 'Successfully Connected with Stripe Connect'
-            else
-              flash[:danger] = "Unable to update customer: #{customer.errors[:base].first}"
-            end
-          else
-            flash[:danger] = "Error when connecting to Stripe /oauth/token: #{token_params[:error]}.  Please try again."
-          end
-        else
-          flash[:danger] = "Error when connecting to Stripe /oauth/authorize: #{params[:error]}.  Please try again."
-        end
-
-        redirect_to URI.parse(@stripe_state_params['redirect_to']).path rescue effective_orders.orders_path
-      end
-
-      private
-
-      def request_access_token(code)
-        stripe_response = `curl -F client_secret='#{EffectiveOrders.stripe[:secret_key]}' -F code='#{code}' -F grant_type='authorization_code' #{EffectiveStripeHelper::STRIPE_CONNECT_TOKEN_URL}`
-        JSON.parse(stripe_response) rescue {}
-      end
-
-      def set_stripe_connect_state_params
-        @stripe_state_params = (JSON.parse(params[:state]) rescue {})
-        @stripe_state_params = {} unless @stripe_state_params.kind_of?(Hash)
-
-        params[:authenticity_token] = @stripe_state_params['form_authenticity_token']
-      end
-    end
-  end
-end

data/app/helpers/effective_ccbill_helper.rb

@@ -1,25 +0,0 @@
-module EffectiveCcbillHelper
-  def ccbill_form_digest(order)
-    digested_variables = [
-      ccbill_price(order.total),
-      EffectiveOrders.ccbill[:form_period],
-      EffectiveOrders.ccbill[:currency_code],
-      EffectiveOrders.ccbill[:dynamic_pricing_salt]
-    ]
-    string = digested_variables.join('')
-    Digest::MD5.hexdigest(string)
-  end
-
-  def ccbill_price(price)
-    number_to_currency(price/100.0, unit: '')
-  end
-
-  def ccbill_customer_name(order, name = :full_name)
-    if order.user.present? && order.user.try(name).present?
-      order.user.public_send(name)
-    elsif order.billing_address.present?
-      order.billing_address.public_send(name)
-    end
-  end
-end
-

data/app/models/effective/providers/ccbill_postback.rb

@@ -1,85 +0,0 @@
-# https://www.ccbill.com/cs/wiki/tiki-index.php?page=Background+Post
-class Effective::Providers::CcbillPostback
-  attr_reader :params
-
-  def initialize(params)
-    @params = params
-  end
-
-  def verified?
-    params[:responseDigest] == digest(digest_value)
-  end
-
-  def matches?(order)
-    price == order.total && order_id == order.to_param
-  end
-
-  def approval?
-    !denial?
-  end
-
-  def denial?
-    # denialId is for subscriptions only
-    [:reasonForDeclineCode, :reasonForDecline, :denialId].any? { |key| params[key].present? }
-  end
-
-  def order_details
-    @order_details ||= get_order_details
-  end
-
-  def order_id
-    params[:order_id]
-  end
-
-  private
-
-  # https://www.ccbill.com/cs/wiki/tiki-index.php?page=Dynamic+Pricing+User+Guide#Postback
-  def digest_value
-    if approval?
-      "#{params[:subscription_id]}1#{salt}" # the `subscriptionId` param in the linked docs is a typo
-    else
-      "#{params[:denialId]}0#{salt}"
-    end
-  end
-
-  def digest(value)
-    Digest::MD5.hexdigest(value)
-  end
-
-  def salt
-    EffectiveOrders.ccbill[:dynamic_pricing_salt]
-  end
-
-  # in cents
-  def price
-    return @price if @price.present?
-    formatted_price = params[:initialFormattedPrice] # example: "$10.00"
-    formatted_price = Nokogiri::HTML::DocumentFragment.parse(formatted_price).to_s # => "$10.00"
-    match = formatted_price.match(/^\D(\d*.\d\d)$/) # {a currency symbol}(digits.two digits)
-    return false unless match.present?
-    formatted_price = match[1] # => "10.00"
-    @price = formatted_price.sub('.', '').to_i # => 1000
-  end
-
-  def get_order_details
-    # ignore some params
-    keepable = params.except(*ignorable_params)
-    # remove blanks
-    keepable.inject({}) do |details, kv_pair|
-      details[kv_pair[0]] = kv_pair[1] if kv_pair[1].present?
-      details
-    end
-  end
-
-  def ignorable_params
-    [
-      # we have these already
-      :clientAccnum,
-      :clientSubacc,
-      :productDesc,
-      # a hash of billing information which CCBill doesn't share the format of (afaik)
-      :paymentAccount
-    ]
-  end
-end
-