spree_bronto 3.pre.0.pre.stable → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3b281282ef7df4d0775cc2f3976816056a08299
-  data.tar.gz: c79c53d0d2365adb45ccaa4bdeb28f1303e1af75
+  metadata.gz: ce7cfe85f900f8971fd940dbdcdd21a5dd17af58
+  data.tar.gz: e42050af673cd1204155fc2d6676c1304a615e08
 SHA512:
-  metadata.gz: 3a7f38114418ee73de73409ab38df5912de2a61c1f0138be74801d4c0ce7abe92de5c6985dc66c66539d1189865f8e641f2563087185f16ff493bd113d84f772
-  data.tar.gz: 88c9f9674a8036d3bfc5ef1625cef6227ce3713d870ad7948a38f08bc1912e62e105b737bf5f98c375d74d07ac8174bcea9f4488ff9c2df84c8fb1b98e0373df
+  metadata.gz: 20f510e2cfdecae46fe16b178c0e26833c4c63d56299a06076e5c4da68b5e5fbf2b5806f287e8052a0de3042dea9a9a7c20817708367ab26620b6a42f1525367
+  data.tar.gz: 34151b42e4aa94ed3d5dfa93b4348ac3b90a5df2666c53dbbcca9c7d339d610ae77da9ef749ad7d9dcad5bf055c5b7f61c6ba84f6452cd3b9b21372b3f63db17

data/app/controllers/spree/checkout_controller_decorator.rb

@@ -1,6 +1,4 @@
 Spree::CheckoutController.class_eval do
-  include Spree::Lists
-  before_action :check_newsletter
 
   def load_order_with_lock
     @order = current_order(lock: true)
@@ -8,16 +6,4 @@ Spree::CheckoutController.class_eval do
     redirect_to spree.cart_path and return unless @order
   end
 
-  private
-  def check_newsletter
-     if params['bronto_list']
-       params['bronto_list'].each do |k,v|
-         list=Spree::BrontoList.find(k)
-         if k && v && @order.email
-           subscribe_to_list(@order.email, list)
-         end
-       end
-     end
-  end
-
 end

data/app/controllers/spree/users_controller_decorator.rb

@@ -1,27 +1,10 @@
 Spree::UsersController.class_eval do
-  include Spree::Lists
 
-  before_action :load_bronto_lists
-  before_action :check_newsletter
+before_action :load_bronto_lists
 
 private
   def load_bronto_lists
       @bronto_lists=current_store.bronto_lists
   end
 
-  def check_newsletter
-    if params['user'] && params['user']['bronto_list_attributes']
-      params['user']['bronto_list_attributes'].each do|k,v|
-        list=Spree::BrontoList.find(k)
-        if k && @user && v=="true"
-          subscribe_to_list(@user, list)
-        end
-
-        if k && @user && v=="false"
-          unsubscribe_from_list(@user, list)
-        end
-
-      end
-    end
-  end
 end

data/app/mailers/spree/order_mailer/_order_shipped_html.html.erb

@@ -2,13 +2,13 @@
 
 <p>
   <strong>Your tracking details:</strong><br />
-  Package ID: <%= order.shipments.first.number %><br />
-  Sent date: <%= order.shipments.first.updated_at.strftime("%B %d %Y at %I:%M %p") %><br />
-  Shipped via: <%= order.shipments.first.shipping_method.name %><br /><br />
-  <%unless order.shipments.first.shipping_method.blank? || order.shipments.first.tracking.blank? %>
-    <%= order.shipments.first.shipping_method.name%> Tracking Number: <%= order.shipments.first.tracking %><br />
+  Package ID: <%= order.shipment.number %><br />
+  Sent date: <%= order.shipment.updated_at.strftime("%B %d %Y at %I:%M %p") %><br />
+  Shipped via: <%= order.shipment.shipping_method.name %><br /><br />
+  <%unless order.shipment.shipping_method.blank? || order.shipment.tracking.blank? %>
+    <%= order.shipment.shipping_method.name%> Tracking Number: <%= order.shipment.tracking %><br />
     To track your package, go to:<br />
-    <a href="<%= order.shipments.first.shipping_method_trackurl+order.shipments.first.tracking %>"><%=order.shipments.first.shipping_method.name %> Tracking</a>
+    <a href="<%= order.shipment.shipping_method_trackurl+order.shipment.tracking %>"><%=order.shipment.shipping_method.name %> Tracking</a>
   <% end %>
 </p>
 

data/app/mailers/spree/order_mailer/_order_shipped_plain.erb

@@ -1,15 +1,15 @@
 This email is to inform you that your order has been shipped on <%= Time.now.strftime("%B %d %Y at %I:%M %p") %>.
 
 Your tracking details:
-Package ID: <%= order.shipments.first.number %>
-Sent date: <%= order.shipments.first.updated_at.strftime("%B %d %Y at %I:%M %p") %>
-Shipped via: <%= order.shipments.first.shipping_method.name %>
+Package ID: <%= order.shipment.number %>
+Sent date: <%= order.shipment.updated_at.strftime("%B %d %Y at %I:%M %p") %>
+Shipped via: <%= order.shipment.shipping_method.name %>
 
-<%unless order.shipments.first.shipping_method.blank? || order.shipments.first.tracking.blank? %>
-<%= order.shipments.first.shipping_method.name%> Tracking Number: <%= order.shipments.first.tracking %>
+<%unless order.shipment.shipping_method.blank? || order.shipment.tracking.blank? %>
+<%= order.shipment.shipping_method.name%> Tracking Number: <%= order.shipment.tracking %>
 
 To track your package, go to:
-<%=  order.shipments.first.shipping_method.trackurl+order.shipments.first.tracking%>
+<%=  order.shipment.shipping_method.trackurl+order.shipment.tracking%>
 <% end %>
 
 Here are the details of the order we received on <%= order.completed_at.strftime("%B %d %Y at %I:%M %p") %>.

data/app/models/spree/order_decorator.rb

@@ -1,4 +1,5 @@
-Spree::Order.class_eval do
+module Spree
+  Order.class_eval do
 
     def deliver_order_confirmation_email
       #OrderMailer.confirm_email(id).deliver_later  # we replace OrderMailer with DelayedSend
@@ -26,5 +27,5 @@ Spree::Order.class_eval do
                        "order_mailer/order_cancel_plain",
                        "order_mailer/order_cancel_html").perform
     end
-
+  end
 end

data/app/models/spree/user_decorator.rb

@@ -5,47 +5,5 @@ module Spree
 
     accepts_nested_attributes_for :bronto_lists
 
-    def deliver_password_reset_instructions!(current_store)
-
-      #@edit_password_reset_url = edit_spree_user_password_url(:reset_password_token => token, :host => current_store.url)
-
-      #mail to: user.email, from: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, :scope => [:devise, :mailer, :reset_password_instructions])
-
-      #Bronto sending
-      #trigger the email directly here.
-      store_code= current_store.code
-      token= Spree::BrontoConfiguration.account[store_code]['token']
-      from_email= current_store.mail_from_address
-      from_name= Spree::BrontoConfiguration.account[store_code]['from_name']
-      reply_email= current_store.mail_from_address
-      email_options={:fromEmail =>from_email,:fromName => from_name, :replyEmail => reply_email}
-
-      user_order=orders.select{|o| o.state='complete'}.last
-
-      message_name= Spree::BrontoConfiguration.account[current_store.code]['password_reset']
-
-      attributes = {:First_Name => user_order.ship_address.firstname} unless !user_order
-      attributes = {:First_Name => user_order.ship_address.lastname} unless !user_order
-
-      attributes[:SENDTIME__CONTENT1] = reset_password_token
-      attributes[:SENDTIME__CONTENT2] = reset_password_token
-
-      begin
-        communication = BrontoIntegration::Communication.new(token)
-        communication.trigger_delivery_by_id(message_name,email,'transactional','html',attributes,email_options)
-
-      rescue => exception
-        begin    #handle the transactional contact in case the message is not approved for transactional.
-          contact = BrontoIntegration::Contact.new(token)
-          contact.update_status(email,'active')
-          communication.trigger_delivery_by_id(message_name,email,'triggered','html',attributes,email_options)
-        rescue => exception
-          raise exception
-        end
-      end
-
-
-    end
-
   end
 end

data/app/overrides/decorate_account_my_orders.rb

@@ -1,6 +1,6 @@
 Deface::Override.new(
     :virtual_path => "spree/users/show",
     :name => "bronto_lists_edit_form",
-    :insert_before => "[data-hook='account_my_orders']",
+    :insert_after => "[data-hook='account_my_orders']",
     :partial => "spree/bronto_lists/edit",
     :disabled => false)

data/app/overrides/decorate_bronto_list_subscribe.rb

@@ -1,6 +1,6 @@
 Deface::Override.new(
     :virtual_path => "spree/checkout/_address",
     :name => "bronto_list_subscribe",
-    :insert_before => "[data-hook='billing_fieldset_wrapper']",
+    :insert_after => "[data-hook='billing_fieldset_wrapper']",
     :partial => "spree/bronto_lists/signup",
     :disabled => false)

data/app/views/spree/bronto_lists/_edit.html.erb

@@ -1,10 +1,11 @@
-<div class="">
-
-<h3><%= t("bronto.my_newsletters") %></h3>
+<div class="address_box">
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @user } %>
 
-<%= form_for(@user, :url => user_path(@user), :html => { :method => :put, :class => "account-summary well" }) do |f| %>
+<%= form_for(@user, :url => user_path(@user), :html => { :method => :put }) do |f| %>
+
+<h2><%= t("bronto.my_newsletters") %></h2>
+<br/>
   <table style="text-align: left">
     <tr>
       <th width="250px"><%= t('name') %></th>
@@ -13,9 +14,7 @@
     <%= render :partial => "spree/bronto_lists/form", @collection => @bronto_lists, :locals => { :f => f } %>
   </table>
 <br/>
-<%= button_tag :class => 'btn btn-submit' do %>
-  <%= t("bronto.update_subscriptions") %>
+<%=button_tag t("bronto.update_subscriptions")%>
 <% end %>
-<% end %>
-
+<br/>
 </div>

data/app/views/spree/bronto_lists/_signup.html.erb

@@ -1,13 +1,11 @@
 <% unless @bronto_lists.blank? %>
     <%- @subscribe = @order.user.nil? ? true : !@order.user.bronto_lists.include?(@bronto_lists.first.id) -%>
-    <p class="address_box" id="snewsletters" >
-      <%= label_tag "Opt-in to our newsletter:" %>
+    <p id="snewsletters" class="field">
+      <label>Opt-in to our newsletter:</label>
       <%= radio_button_tag("bronto_list[#{@bronto_lists.first.id}]", true, @subscribe, :style => "width:20px;") %>
       <span><%= t("yes") %>&nbsp;</span>
 
       <%= radio_button_tag("bronto_list[#{@bronto_lists.first.id}]", false, !@subscribe, :style => "width:20px;") %>
       <span><%= t("no") %></span>
-      <span class="note">(sent twice a month, includes unadvertised discounts)</span>
     </p>
-
 <% end %>

data/app/views/spree/shared/_bronto_tags.html.erb

@@ -1,4 +1,4 @@
-<% tagkey= Spree::BrontoConfiguration.account[current_store.code]['tagkey'] unless !@order %>
+<% tagkey= Spree::BrontoConfiguration.account[@order.store.code]['tagkey'] unless !@order %>
 
 <script type="text/javascript">
     var _bsw = _bsw || [];
@@ -19,7 +19,7 @@
        cartItems += ', "sku": "' + item.variant.sku
        cartItems += '", "category": "'
        cartItems += '", "description": "'
-       cartItems += '", "productUrl": "' + 'http://www.' + current_store.name.downcase + '/products/' + item.product.slug
+       cartItems += '", "productUrl": "' + 'http://www.' + @order.store.name.downcase + '/products/' + item.product.slug
        cartItems += '", "name": "' + ERB::Util.html_escape(item.product.name)
        cartItems += '", "quantity": ' + item.quantity.to_s
        cartItems += ', "salePrice": 0'
@@ -37,7 +37,7 @@
             "grandTotal": <%= @order.total.to_s %>,
             "subtotal": <%= @order.item_total.to_s %>,
             "discountAmount": <%= (100*@order.line_item_adjustments.promotion.eligible.map{|t| t.amount}.sum).to_i/100.00 %>,
-            "url": "http://www.<%= current_store.name.downcase %>/cart",
+            "url": "http://www.<%= @order.store.name.downcase %>/orders/new",
             "currency": "USD",
             "taxAmount": <%= (100*@order.line_item_adjustments.tax.eligible.map{|t| t.amount}.sum).to_i/100.00 %>,
             "lineItems": <%= cartItems.html_safe %>

data/config/locales/en.yml

@@ -3,8 +3,6 @@
 
 en:
  spree:
-  subscription_sent: Signed up
-  subscription_notsent: Singup failed
   bronto:
     lists_admin: Bronto Lists
     manage_settings: Manage Bronto mailing lists made available to Spree users
@@ -23,5 +21,4 @@ en:
     update_subscriptions: Update Subscriptions
     subscribed: Subscribed?
     subscribe_question: Would you like to subscribe to any of our newsletters?
-    store_id: Web Store
-    no_such_list: This newsletter does not exist
+    store_id: Web Store

data/config/routes.rb

@@ -6,14 +6,4 @@ Spree::Core::Engine.routes.append do
       end
     end
   end
-
-  resources :orders, :except => [:index, :new, :create, :destroy] do
-    patch :subscribe, :on => :member
-  end
-
-  post "/subscribenewsletter", :to => 'home#subscribenewsletter'
-  post "/subscribecampaign", :to => 'home#subscribecampaign'
-  post "/subscribecampaign_with_ops", :to => 'home#subscribecampaign_with_ops'
-
-end
-
+end

data/lib/delayed_send.rb

@@ -1,4 +1,4 @@
-DelayedSend = Struct.new(:store_code, :email, :message_name, :order_id, :plain_view, :html_view) do
+class DelayedSend < Struct.new(:store_code, :email, :message_name, :order_id, :plain_view, :html_view)
   def perform
     return if email.blank?
     #store_code ||= 'default'

data/lib/delayed_subscriber_add.rb

@@ -1,4 +1,5 @@
-DelayedSubscriberAdd = Struct.new(:store_code, :user, :list, :ops) do
+
+class DelayedSubscriberAdd < Struct.new(:store_code, :user, :list, :ops)
   def perform
 
     if list.nil? || !user
@@ -25,14 +26,13 @@ DelayedSubscriberAdd = Struct.new(:store_code, :user, :list, :ops) do
       end
     end
 
-    #unless user.is_a? String
-    #  begin
-    #  user.bronto_lists << list
-    #  user.save!
-    #  rescue
-    #  end
-    #end
-
+    unless user.is_a? String
+      begin
+      user.bronto_lists << list
+      user.save!
+      rescue
+      end
+    end
 
   end
 end

data/lib/delayed_subscriber_delete.rb

@@ -1,4 +1,4 @@
-DelayedSubscriberDelete = Struct.new(:store_code, :user, :list) do
+class DelayedSubscriberDelete < Struct.new(:store_code, :user, :list)
   def perform
     if list.nil? || !user
       subscriber_id = -1
@@ -19,17 +19,17 @@ DelayedSubscriberDelete = Struct.new(:store_code, :user, :list) do
       end
     end
 
-    #unless user.is_a? String    # update  exact_target_lists
-    #  begin
-    #    list_del=user.bronto_lists.select{|l| l.id== list.id}
-    #    if list_del.length>0
-    #      user.bronto_lists.delete(list_del)
-    #    end
-    #    user.save!
-    #  rescue
-    #    #raise exception
-    #  end
-    #end
+    unless user.is_a? String    # update  exact_target_lists
+      begin
+        list_del=user.bronto_lists.select{|l| l.id== list.id}
+        if list_del.length>0
+          user.bronto_lists.delete(list_del)
+        end
+        user.save!
+      rescue
+        #raise exception
+      end
+    end
 
   end
 end

data/lib/delayed_subscriber_update.rb

@@ -1,4 +1,4 @@
-DelayedSubscriberUpdate = Struct.new(:token, :order_id) do
+class DelayedSubscriberUpdate < Struct.new(:token, :order_id)
 
   def perform
     order = Spree::Order.find(order_id)

data/lib/delayed_trigger.rb

@@ -1,4 +1,4 @@
-DelayedTrigger = Struct.new(:store_code, :email, :message_name, :attributes, :mail_type) do
+class DelayedTrigger < Struct.new(:store_code, :email, :message_name, :attributes, :mail_type)
   def perform
     return if email.blank?
     begin

data/lib/spree_bronto/engine.rb

@@ -16,12 +16,8 @@ module SpreeBronto
       Dir.glob(File.join(File.dirname(__FILE__), '../../lib/bronto_integration/bronto_integration.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
-      #Dir.glob(File.join(File.dirname(__FILE__), '../../lib/spree/controller_helpers/list.rb')) do |c|
-      #  Rails.configuration.cache_classes ? require(c) : load(c)
-      #end
-      Dir.glob(File.join(File.dirname(__FILE__), '../../lib/delayed_*.rb')) do |c|
-        require(c)
-        #Rails.configuration.cache_classes ? require(c) : load(c)
+      Dir.glob(File.join(File.dirname(__FILE__), '../../lib/delayed*.rb')) do |c|
+        Rails.configuration.cache_classes ? require(c) : load(c)
       end
     end
 

data/spree_bronto.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_bronto'
-  s.version     = '3-0-stable'
+  s.version     = '3.0.0'
   s.summary     = 'Integrate Bronto email server and cart recovery into Spree Ecommerce platform'
   s.description = 'Integrate Bronto email server and cart recovery into Spree Ecommerce platform'
   s.required_ruby_version = '>= 2.0.0'
@@ -16,8 +16,7 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  version = '~> 3-0-stable'
-  #s.add_dependency 'spree_core'
+  s.add_dependency 'spree_core', '~> 3.0.0'
 
   s.add_development_dependency 'capybara', '~> 2.4'
   s.add_development_dependency 'coffee-rails'

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: spree_bronto
 version: !ruby/object:Gem::Version
-  version: 3.pre.0.pre.stable
+  version: 3.0.0
 platform: ruby
 authors:
 - Albert Liu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: spree_core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -170,9 +184,6 @@ files:
 - app/assets/stylesheets/spree/frontend/spree_bronto.css
 - app/controllers/spree/admin/bronto_lists_controller.rb
 - app/controllers/spree/checkout_controller_decorator.rb
-- app/controllers/spree/home_controller_decorator.rb
-- app/controllers/spree/lists.rb
-- app/controllers/spree/orders_controller_decorator.rb
 - app/controllers/spree/users_controller_decorator.rb
 - app/mailers/spree/order_mailer/_order_cancel_html.html.erb
 - app/mailers/spree/order_mailer/_order_cancel_plain.erb
@@ -182,13 +193,10 @@ files:
 - app/mailers/spree/order_mailer/_order_details_plain.erb
 - app/mailers/spree/order_mailer/_order_shipped_html.html.erb
 - app/mailers/spree/order_mailer/_order_shipped_plain.erb
-- app/mailers/spree/user_mailer/_password_reset_instructions.html.erb
-- app/mailers/spree/user_mailer_decorator.rb
 - app/models/spree/bronto_configuration.rb
 - app/models/spree/bronto_list.rb
 - app/models/spree/order_decorator.rb
 - app/models/spree/shipment_decorator.rb
-- app/models/spree/shipment_handler_decorator.rb
 - app/models/spree/store_decorator.rb
 - app/models/spree/user_decorator.rb
 - app/overrides/decorate_account_my_orders.rb
@@ -219,7 +227,6 @@ files:
 - lib/bronto_integration/bronto_integration/contact.rb
 - lib/bronto_integration/bronto_integration/order.rb
 - lib/delayed_send.rb
-- lib/delayed_simple_send.rb
 - lib/delayed_subscriber_add.rb
 - lib/delayed_subscriber_delete.rb
 - lib/delayed_subscriber_update.rb
@@ -244,9 +251,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - none
 rubyforge_project: 

data/app/controllers/spree/home_controller_decorator.rb

@@ -1,120 +0,0 @@
-Spree::HomeController.class_eval do
-
-  def subscribenewsletter
-    name=params[:name] || ''
-    email=params[:email]
-    receipt=params[:receipt] || ''
-    subject=params[:subject] || 'Customer Record'
-    if receipt.length>0
-      external_key = Spree::BrontoConfiguration.account[current_store.code]["ET_simple_send"]
-      params.delete('action')
-      params.delete('receipt')
-      params.delete('authenticity_token')
-      params.delete('controller')
-      params.delete('subject')
-      params.delete('cc_receipt')
-      the_content=''
-      ks=[]
-      vs=[]
-      params.each do |k,v|
-        ks << k
-        vs << v
-      end
-      the_content = ks.join(',') + '<br/>' + vs.join(',')
-      et_a={:SENDTIME__CONTENT2 => the_content, :SENDTIME__CONTENT1 => subject}
-      #et_a={:SENDTIME__CONTENT2 => 'Name: ' + name +'<br/>Email: ' + email + '<br/>Address: ' + params[:address]  + '<br/>City: ' + params[:city] + '<br/>State: ' + params[:state]  +'<br/>Zip: ' + params[:zip]  +'<br/>Phone: ' + params[:phone]  +'<br/>Credentials: ' + params[:credentials]}
-      Delayed::Job.enqueue DelayedSimpleSend.new(current_store.code, receipt, external_key, et_a,'html')
-      cc_receipt= params[:cc_receipt] || ''
-      if cc_receipt.length>0
-        Delayed::Job.enqueue DelayedSimpleSend.new(current_store.code, cc_receipt, external_key, et_a,'html')
-      end
-    end
-    if email.length>0
-      if current_store.code == 'pwb'
-        title='Pets & Products Newsletter'
-      elsif current_store.code == 'he'
-        title='HairEssentials Products Newsletter'
-      else
-        title='Natural Products Newsletter'
-      end
-      campaign= Spree::BrontoList.find_by_title(title)
-      if !!campaign
-        Delayed::Job.enqueue DelayedSubscriberAdd.new(current_store.code, email, campaign, {:First_Name => name})
-      end
-      render :json => ({
-                 :success => true,
-                 :message => t( :subscription_sent )
-             }).to_json
-    else
-      render :json => ({
-                 :success => false,
-                 :message => t( :subscription_notsent )
-             }).to_json
-    end
-    #redirect_to "/meetexperts"
-    #render :js =>'alert("Our server temperarily busy, please try again later.")'
-
-  end
-
-  # sign up compaign flexible form, like the one for newsletter.
-  def subscribecampaign
-    name=params[:name] || ''
-    email=params[:email]
-    campaign_id=params[:campaign_id] || ''
-    if email.length>0
-      campaign=Spree::BrontoList.find_by_list_id(campaign_id)
-      if !!campaign
-        options=cookies[:campaign_options] || '{}'
-        options=Hash[JSON.parse(options).map{|(k,v)| [k.to_sym,v]}]
-        Rails.logger.info "find campaign_options cookie: #{cookies.inspect}"
-        Delayed::Job.enqueue DelayedSubscriberAdd.new(current_store.code, email, campaign, {:First_Name => name})
-      end
-
-      drop_email_key=params[:drop_email_key] || ''
-      unless drop_email_key.blank?
-        Delayed::Job.enqueue DelayedSimpleSend.new(current_store.code, email, drop_email_key, {},'html')
-      end
-      render :json => ({
-                 :success => true,
-                 :message => t( :subscription_sent )
-             }).to_json
-    else
-      render :json => ({
-                 :success => false,
-                 :message => t( :subscription_notsent )
-             }).to_json
-    end
-
-  end
-
-
-  # sign up compaign flexible form, like the one for newsletter.
-  def subscribecampaign_with_ops
-    email=params[:email]
-    campaign_id=params[:campaign_id] || ''
-    ops=params[:ops]
-    if email.length>0
-      campaign=Spree::BrontoList.find_by_list_id(campaign_id)
-      if !!campaign
-        Delayed::Job.enqueue DelayedSubscriberAdd.new(current_store.code, email, campaign,ops)
-      end
-
-      drop_email_key=params[:drop_email_key] || ''
-      unless drop_email_key.blank?
-        Delayed::Job.enqueue DelayedSimpleSend.new(current_store.code, email, drop_email_key, {},'html')
-      end
-
-      render :json => ({
-                 :success => true,
-                 :message => t( :subscription_sent )
-             }).to_json
-    else
-      render :json => ({
-                 :success => false,
-                 :message => t( :subscription_notsent )
-             }).to_json
-    end
-
-  end
-
-end

data/app/controllers/spree/lists.rb

@@ -1,152 +0,0 @@
-module Spree
-   module Lists
-     extend ActiveSupport::Concern
-
-    def autosubscribe_list(store)
-      Spree::BrontoList.where(:store_id =>store.id,:subscribe_all_new_users =>true)
-    end
-
-    def create_subscriber(user)
-      if user.is_a? String
-        order = Spree::Order.find_by_email(user, :order => "updated_at desc")
-        store= current_order.store
-        list = autosubscribe_list(store) if checkout
-      else
-        store=current_store
-        list = autosubscribe_list(store)
-      end
-
-      subscribe_to_list(user, list) unless !list
-
-      # synchronize the subscription list from bronto this customer subscribed before registration
-      unless user.is_a? String
-        begin
-          user.reload
-          bronto=Bronto.new(Spree::BrontoConfiguration.account[store.code]['bronto_token'])
-          contact=bronto.read_contacts(user.email,true)
-          list_ids=contact[:list_ids]
-          if list_ids
-            unless list_ids.class == Array
-              list_ids=[list_ids]
-            end
-            list_ids.each do |l|
-              list=Spree::BrontoList.find_by_list_id(l)
-              if !!list && (!user.bronto_lists.map(&:list_id).include? l )
-                user.exact_target_subscriber_id = contact[:id]  #seems we do not need this
-                user.bronto_lists << list
-                user.save!
-              end
-            end
-          end
-
-        rescue
-          # do nothing here at this moment
-        end
-      end
-
-    end
-
-    def subscribe_to_list(user, list)
-
-      order=current_order
-
-      pwb_cat=''
-      pwbCat = lambda{|order|
-        iscat=false
-        order.line_items.each do |item|
-          if item.variant.product.taxons.map{|t| t.id}.include?(3002)
-            iscat=true
-          end
-        end
-        if iscat
-          'cat'
-        else
-          'dog'
-        end
-      }
-      if order
-        #logger.debug 'call subscribe_to_list there is a order'
-        store=order.store
-        store_code=store.code
-        pwb_cat= (store_code=="pwb" ? pwbCat.call(order) : '')
-      else
-        store_code=current_store.code
-        pwb_cat=''
-      end
-      #logger.debug '-- found the pwb_cat: ' + pwb_cat
-      Delayed::Job.enqueue( DelayedSubscriberAdd.new(store_code, user, list, {:C_or_D => pwb_cat}), -20 )
-
-      unless user.is_a? String
-        user.bronto_lists << list
-        user.save!
-      end
-
-    end
-
-    def unsubscribe_from_list(user, list)
-
-      store = current_store
-      Delayed::Job.enqueue( DelayedSubscriberDelete.new(store.code, user, list), -20 )
-
-      unless user.is_a? String    # update  exact_target_lists
-        begin
-          list_del=user.bronto_lists.select{|l| l.id== list.id}
-          if list_del.length>0
-            user.bronto_lists.delete(list_del)
-          end
-          user.save!
-        rescue
-          #raise exception
-        end
-      end
-
-    end
-
-    #private
-    #CONTROLLER Actions
-    def get_bronto_lists
-      @bronto_lists = Spree::BrontoList.where(:visible => true)
-    end
-
-    def update_bronto_lists
-      return unless params.key? :bronto_list
-
-      unless @checkout.nil?
-        session[ :bronto_list ] = []
-      end
-
-      @user = @checkout.order.user if @user.nil? && !@checkout.nil?
-
-      params[:bronto_list].each do |id, do_subscribe|
-        do_subscribe = (do_subscribe == "true")
-        list = Spree::BrontoList.find(id)
-        if !@checkout.nil? &&  do_subscribe
-          session[ :bronto_list ] << id
-        end
-
-        if @user.nil? && !@checkout.nil? #guest checkout
-          if do_subscribe
-            #subscribe
-            subscribe_to_list(@checkout.email, list)
-          else
-            #unsubscribe
-            unsubscribe_from_list(@checkout.email, list)
-          end
-        else #normal checkout
-          if do_subscribe
-            #subscribe
-            unless @user.bronto_lists.include? list
-              subscribe_to_list(@user, list)
-            end
-          else
-            #unsubscribe
-            if @user.bronto_lists.include? list
-              unsubscribe_from_list(@user, list)
-            end
-          end
-        end
-      end
-
-    end
-  end
-end

data/app/controllers/spree/orders_controller_decorator.rb

@@ -1,56 +0,0 @@
-Spree::OrdersController.class_eval do
-  include Spree::Lists
-
-  def subscribe
-    @order = Spree::Order.find_by_number!(params[:id])
-    list = Spree::BrontoList.find( params[ :list ] )
-    unless list.nil?
-      unless @order.user.nil?
-        dest = @order.user
-      else
-        dest = @order.email
-      end
-      unless dest.nil?
-        subscribe_to_list(dest, list)
-        respond_to do |format|
-          format.html {
-            flash[:notice] = Spree.t( :subscription_sent ) unless session[ :return_to ]
-            redirect_to checkout_state_path(@order.state)
-          }
-          format.js {
-            render :json => ({
-                       :success => true,
-                       :message => Spree.t( :subscription_sent )
-                   }).to_json
-          }
-        end
-      else
-        respond_to do |format|
-          format.html {
-            flash[:error] = Spree.t( :subscription_notsent ) unless session[ :return_to ]
-            redirect_to checkout_state_path(@order.state)
-          }
-          format.js {
-            render :json => ({
-                       :success => false,
-                       :message => Spree.t( :subscription_notsent )
-                   }).to_json
-          }
-        end
-      end
-    else
-      respond_to do |format|
-        format.html {
-          flash[:error] = Spree.t( :no_such_list ) unless session[ :return_to ]
-          redirect_to checkout_state_path(@order.state)
-        }
-        format.js {
-          render :json => ({
-                     :success => false,
-                     :message => Spree.t( :no_such_list )
-                 }).to_json
-        }
-      end
-    end
-  end
-end

data/app/mailers/spree/user_mailer/_password_reset_instructions.html.erb

@@ -1,9 +0,0 @@
-<% 
-Rails.logger.error( "#{"\n" * 40}#{"@" * 80}" )
-Rails.logger.error( @key )
-Rails.logger.error( "#{"@" * 80}#{"\n" * 40}" )
-user_order=@user.orders.select{|o| o.state!='in_progress'}.last
--%>
-external_key: <%= Spree::BrontoConfiguration.account[current_store.code]['ET_password_reset']%>
-firstname: <%= user_order.ship_address.firstname unless !user_order %>
-SENDTIME__CONTENT1: <%= @user.perishable_token %>

data/app/mailers/spree/user_mailer_decorator.rb

@@ -1,13 +0,0 @@
-Spree::UserMailer.class_eval do
-    def reset_password_instructions(user, token, *args)
-        # we do not user this any more
-    end
-
-
-    def confirmation_instructions(user, token, opts={})
-      @confirmation_url = spree.spree_user_confirmation_url(:confirmation_token => token, :host => Spree::Store.current.url)
-
-      mail to: user.email, from: from_address, subject: Spree::Store.current.name + ' ' + I18n.t(:subject, :scope => [:devise, :mailer, :confirmation_instructions])
-    end
-
-end

data/app/models/spree/shipment_handler_decorator.rb

@@ -1,17 +0,0 @@
-Spree::ShipmentHandler.class_eval do
-
-    private
-    def send_shipped_email
-      #ShipmentMailer.shipped_email(id).deliver_later
-      order=@shipment.order
-      external_key = Spree::BrontoConfiguration.account[order.store.code]["order_shipped"]
-
-      DelayedSend.new( order.store.code,
-                       order.email,
-                       external_key,
-                       order.id.to_s,
-                       "order_mailer/order_shipped_plain",
-                       "order_mailer/order_shipped_html").perform
-    end
-
-end

data/lib/delayed_simple_send.rb

@@ -1,17 +0,0 @@
-DelayedSimpleSend = Struct.new(:store_code, :email, :message_name, :attributes, :mail_type) do
-  def perform
-    return if email.blank?
-    begin
-      token= Spree::BrontoConfiguration.account[store_code]['token']
-      from_email= order.store.mail_from_address
-      from_name= Spree::BrontoConfiguration.account[store_code]['from_name']
-      reply_email= order.store.mail_from_address
-
-      email_options={:fromEmail =>from_email,:fromName => from_name, :replyEmail => reply_email}
-      communication = BrontoIntegration::Communication.new(token)
-      communication.trigger_delivery_by_id(message_name,email,'triggered',mail_type||'html',attributes||{},email_options)
-    rescue => exception
-      #raise exception   # as now only campaign use this and their templates may not be approved. let it go.
-    end
-  end
-end