solidus_virtual_gift_card 1.2.0 → 1.3.0

data/app/overrides/admin_gift_card_order_confirmation.rb

@@ -1,6 +1,6 @@
 Deface::Override.new(
-  virtual_path: "spree/admin/orders/confirm",
-  name: "add_gift_cards_to_admin_order_confirmation",
-  insert_before: "#order-total",
-  partial: "spree/admin/orders/confirmation_gift_card_details",
+  virtual_path: 'spree/admin/orders/confirm',
+  name: 'add_gift_cards_to_admin_order_confirmation',
+  insert_before: '#order-total',
+  partial: 'spree/admin/orders/confirmation_gift_card_details'
 )

data/app/overrides/admin_item_view_gift_card_codes.rb

@@ -1,20 +1,20 @@
 Deface::Override.new(
-  virtual_path: "spree/admin/orders/_line_items",
-  name: "add_gift_cards_to_admin_line_items",
-  insert_bottom: ".line-item-name",
-  partial: "spree/admin/orders/cart_gift_card_details",
+  virtual_path: 'spree/admin/orders/confirm/_shipment_manifest',
+  name: 'add_gift_cards_to_admin_confirm',
+  insert_bottom: '.item-name',
+  partial: 'spree/admin/orders/cart_gift_card_details',
 )
 
 Deface::Override.new(
-  virtual_path: "spree/admin/orders/_shipment_manifest",
-  name: "admin_item_view_gift_card_codes",
-  insert_bottom: ".item-name",
-  partial: "spree/admin/orders/shipments_gift_card_details",
+  virtual_path: 'spree/admin/orders/_shipment_manifest',
+  name: 'admin_item_view_gift_card_codes',
+  insert_bottom: '.item-name',
+  partial: 'spree/admin/orders/shipments_gift_card_details',
 )
 
 Deface::Override.new(
-  virtual_path: "spree/admin/orders/_carton_manifest",
-  name: "admin_item_view_gift_card_codes",
-  insert_bottom: ".item-name",
-  partial: "spree/admin/orders/shipments_gift_card_details",
+  virtual_path: 'spree/admin/orders/_carton_manifest',
+  name: 'admin_item_view_gift_card_codes',
+  insert_bottom: '.item-name',
+  partial: 'spree/admin/orders/shipments_gift_card_details',
 )

data/app/overrides/admin_user_sidebar_store_credits.rb

@@ -1,6 +1,6 @@
 Deface::Override.new(
-  virtual_path: "spree/admin/users/_sidebar",
-  name: "admin_user_sidebar_store_credits",
+  virtual_path: 'spree/admin/users/_sidebar',
+  name: 'admin_user_sidebar_store_credits',
   insert_bottom: "[data-hook='admin_user_tab_options']",
-  partial: "spree/admin/users/gift_card_sidebar",
+  partial: 'spree/admin/users/gift_card_sidebar'
 )

data/app/overrides/admin_user_sub_menu.rb

@@ -1,6 +1,6 @@
 Deface::Override.new(
-  virtual_path: "spree/admin/shared/_tabs",
-  name: "admin_user_sub_menu_index",
+  virtual_path: 'spree/admin/shared/_tabs',
+  name: 'admin_user_sub_menu_index',
   replace: "erb[loud]:contains('BackendConfiguration::USER_TABS')",
   text: <<-ERB)
 <%= tab *Spree::BackendConfiguration::USER_TABS, url: spree.admin_users_path, icon: 'user' do %>

data/app/views/spree/admin/gift_cards/_lookup_form.html.erb

@@ -1,5 +1,5 @@
 <% content_for :table_filter_title do %>
-  <%= Spree.t(:search) %>
+  <%= I18n.t('spree.search') %>
 <% end %>
 
 <% content_for :table_filter do %>
@@ -33,7 +33,7 @@
       <div class="clearfix"></div>
 
       <div class="actions filter-actions">
-        <%= button 'Lookup Gift Card', 'search' %>
+        <%= button_tag 'Lookup Gift Card' %>
       </div>
     <% end %>
   </div>

data/app/views/spree/admin/gift_cards/_redemption_form.html.erb

@@ -1,7 +1,7 @@
 <div class="row">
   <div class="alpha twelve columns">
     <%= f.field_container :redemption_code do %>
-    <%= f.label :redemption_code, Spree.t('admin.gift_cards.redemption_code') %> <span class="required">*</span><br />
+    <%= f.label :redemption_code, I18n.t('spree.admin.gift_cards.redemption_code') %> <span class="required">*</span><br />
     <%= f.text_field :redemption_code %>
     <% end %>
   </div>

data/app/views/spree/admin/gift_cards/edit.html.erb

@@ -22,7 +22,7 @@
     <div class="row">
       <div class="alpha twelve columns">
         <%= f.field_container :recipient_name do %>
-        <%= f.label :recipient_name, Spree.t('admin.gift_cards.recipient_name') %> <br />
+        <%= f.label :recipient_name, I18n.t('spree.admin.gift_cards.recipient_name') %> <br />
         <%= f.text_field :recipient_name, class: 'fullwidth' %>
         <% end %>
       </div>
@@ -31,7 +31,7 @@
     <div class="row">
       <div class="alpha twelve columns">
         <%= f.field_container :recipient_email do %>
-        <%= f.label :recipient_email, Spree.t('admin.gift_cards.recipient_email') %> <br />
+        <%= f.label :recipient_email, I18n.t('spree.admin.gift_cards.recipient_email') %> <br />
         <%= f.text_field :recipient_email, class: 'fullwidth' %>
         <% end %>
       </div>
@@ -40,7 +40,7 @@
     <div class="row">
       <div class="alpha twelve columns">
         <%= f.field_container :purchaser_name do %>
-        <%= f.label :purchaser_name, Spree.t('admin.gift_cards.purchaser_name') %> <br />
+        <%= f.label :purchaser_name, I18n.t('spree.admin.gift_cards.purchaser_name') %> <br />
         <%= f.text_field :purchaser_name, class: 'fullwidth' %>
         <% end %>
       </div>
@@ -49,7 +49,7 @@
     <div class="row">
       <div class="alpha twelve columns">
         <%= f.field_container :gift_message do %>
-        <%= f.label :gift_message, Spree.t('admin.gift_cards.gift_message') %> <br />
+        <%= f.label :gift_message, I18n.t('spree.admin.gift_cards.gift_message') %> <br />
         <%= f.text_area :gift_message, class: 'fullwidth', maxlength: '140' %>
         <% end %>
       </div>
@@ -63,7 +63,7 @@
           </div>
         <% else %>
           <%= f.field_container :send_email_at do %>
-          <%= f.label :send_email_at, Spree.t('admin.gift_cards.send_email_at') %> <br />
+          <%= f.label :send_email_at, I18n.t('spree.admin.gift_cards.send_email_at') %> <br />
           <%= f.text_field :send_email_at, :class => 'datepicker datepicker-from giftcard-datepicker' %>
           <% end %>
         <% end %>

data/app/views/spree/admin/gift_cards/index.html.erb

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:listing_gift_cards) %>
+  <%= I18n.t('spree.listing_gift_cards') %>
 <% end %>
 
 <%= render partial: 'lookup_form' %>

data/app/views/spree/admin/gift_cards/lookup.html.erb

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= link_to "#{Spree.t(:editing_user)} #{@user.email}", edit_admin_user_url(@user) %>
+  <%= link_to "#{I18n.t('spree.editing_user')} #{@user.email}", edit_admin_user_url(@user) %>
 <% end %>
 
 <%= render :partial => 'spree/admin/users/sidebar', :locals => { :current => :gift_cards } %>

data/app/views/spree/admin/orders/_confirmation_gift_card_details.html.erb

@@ -1,6 +1,6 @@
 <fieldset class="no-border-bottom">
   <legend align="center" data-hook="gift-card">
-    <%= Spree.t(:gift_cards_details) %>
+    <%= I18n.t('spree.gift_cards_details') %>
   </legend>
 </fieldset>
 
@@ -15,13 +15,13 @@
   </colgroup>
 
   <thead>
-    <th><%= Spree.t(:recipient_email) %></th>
-    <th><%= Spree.t(:recipient_name) %></th>
-    <th><%= Spree.t(:purchaser_name) %></th>
-    <th><%= Spree.t(:gift_message) %></th>
-    <th><%= Spree.t(:send_email_at) %></th>
+    <th><%= I18n.t('spree.recipient_email') %></th>
+    <th><%= I18n.t('spree.recipient_name') %></th>
+    <th><%= I18n.t('spree.purchaser_name') %></th>
+    <th><%= I18n.t('spree.gift_message') %></th>
+    <th><%= I18n.t('spree.send_email_at') %></th>
   </thead>
-  
+
 
   <tbody>
     <% @order.line_items.flat_map(&:gift_cards).each do |gift_card| %>
@@ -42,9 +42,9 @@
           <%= gift_card.formatted_send_email_at || "Immediately" %>
         </td>
         <td class="actions">
-          <%= link_to '', edit_admin_order_gift_card_path(@order, gift_card), :class => 'fa fa-edit no-text with-tip', :title => Spree.t('actions.edit') %>
+          <%= link_to '', edit_admin_order_gift_card_path(@order, gift_card), :class => 'fa fa-edit no-text with-tip', :title => I18n.t('spree.actions.edit') %>
         </td>
       </tr>
     <% end %>
   </tbody>
-</table>
+</table>

data/app/views/spree/admin/orders/_gift_card_details.html.erb

@@ -1,7 +1,7 @@
-<br><strong><%= Spree.t('admin.gift_cards.redemption_code') %>:</strong> <%= gift_card.redemption_code %>
+<br><strong><%= I18n.t('spree.admin.gift_cards.redemption_code') %>:</strong> <%= gift_card.redemption_code %>
 <br>
 <% if gift_card.deactivated? %>
   <b>DEACTIVATED</b>
 <% end %>
 <% edit_text = gift_card.deactivated? ? "(Details)" : "(Edit Details)" %>
-<%= link_to edit_text, edit_admin_order_gift_card_path(@order, gift_card), class: 'edit-gift-card-details' %>
+<%= link_to edit_text, spree.edit_admin_order_gift_card_path(@order, gift_card), class: 'edit-gift-card-details' %>

data/app/views/spree/admin/users/_gift_card_sidebar.html.erb

@@ -1,3 +1,3 @@
 <li<%== ' class="active"' if current == :gift_cards %>>
-  <%= link_to_with_icon 'gift', Spree.t(:"admin.gift_cards.redeem_gift_card"), lookup_admin_user_gift_cards_path(@user) %>
-</li>
+  <%= link_to_with_icon 'gift', Spree.t(:"admin.gift_cards.redeem_gift_card"), spree.lookup_admin_user_gift_cards_path(@user) %>
+</li>

data/app/views/spree/gift_card_mailer/gift_card_email.text.erb

@@ -1,7 +1,7 @@
-<%= Spree.t('gift_card_mailer.gift_card_email.dear_customer') %>
+<%= I18n.t('spree.gift_card_mailer.gift_card_email.dear_customer') %>
 
-<%= Spree.t('gift_card_mailer.gift_card_email.your_gift_card_code') %>
+<%= I18n.t('spree.gift_card_mailer.gift_card_email.your_gift_card_code') %>
 
 ============================================================
-<%= Spree.t('gift_card_mailer.gift_card_email.gift_card_code', code: @gift_card.redemption_code) %>
+<%= I18n.t('spree.gift_card_mailer.gift_card_email.gift_card_code', code: @gift_card.redemption_code) %>
 ============================================================

data/config/initializers/line_item_controller_gift_card_details.rb

@@ -1,4 +1,4 @@
 Rails.application.config.to_prepare do
-  Spree::Api::LineItemsController.line_item_options += [gift_card_details: [:recipient_name, :recipient_email, :gift_message, :purchaser_name, :send_email_at]]
+  Spree::PermittedAttributes.line_item_attributes << { options: [gift_card_details: [:recipient_name, :recipient_email, :gift_message, :purchaser_name, :send_email_at]] }
   Spree::Order.line_item_comparison_hooks.add('gift_card_match')
 end

data/db/migrate/20140623152903_create_virtual_gift_card.rb

@@ -1,4 +1,4 @@
-class CreateVirtualGiftCard < ActiveRecord::Migration
+class CreateVirtualGiftCard < SolidusSupport::Migration[4.2]
   def change
     create_table :spree_virtual_gift_cards do |t|
       t.integer :purchaser_id

data/db/migrate/20140624175113_seed_gift_card_category.rb

@@ -1,4 +1,4 @@
-class SeedGiftCardCategory < ActiveRecord::Migration
+class SeedGiftCardCategory < SolidusSupport::Migration[4.2]
   def change
     Spree::StoreCreditCategory.find_or_create_by(name: 'Gift Card')
   end

data/db/migrate/20140627185148_add_timestamps_to_gift_cards.rb

@@ -1,4 +1,4 @@
-class AddTimestampsToGiftCards < ActiveRecord::Migration
+class AddTimestampsToGiftCards < SolidusSupport::Migration[4.2]
   def change
     add_column :spree_virtual_gift_cards, :created_at, :datetime
     add_column :spree_virtual_gift_cards, :updated_at, :datetime

data/db/migrate/20140702153907_add_gift_card_flag_to_products.rb

@@ -1,4 +1,4 @@
-class AddGiftCardFlagToProducts < ActiveRecord::Migration
+class AddGiftCardFlagToProducts < SolidusSupport::Migration[4.2]
   def change
     add_column :spree_products, :gift_card, :boolean, default: false
   end

data/db/migrate/20140707200431_add_line_item_to_gift_card.rb

@@ -1,4 +1,4 @@
-class AddLineItemToGiftCard < ActiveRecord::Migration
+class AddLineItemToGiftCard < SolidusSupport::Migration[4.2]
   def change
     add_column :spree_virtual_gift_cards, :line_item_id, :integer
 

data/db/migrate/20151013172931_add_recipient_fields_to_virtual_gift_card.rb

@@ -1,4 +1,4 @@
-class AddRecipientFieldsToVirtualGiftCard < ActiveRecord::Migration
+class AddRecipientFieldsToVirtualGiftCard < SolidusSupport::Migration[4.2]
   def change
     add_column :spree_virtual_gift_cards, :recipient_name, :string
     add_column :spree_virtual_gift_cards, :recipient_email, :string

data/db/migrate/20151013210615_add_active_flag_to_virtual_gift_card.rb

@@ -1,4 +1,4 @@
-class AddActiveFlagToVirtualGiftCard < ActiveRecord::Migration
+class AddActiveFlagToVirtualGiftCard < SolidusSupport::Migration[4.2]
   def change
     add_column :spree_virtual_gift_cards, :redeemable, :boolean, default: false
   end

data/db/migrate/20151013214647_set_redeemable_true_on_virtual_gift_cards.rb

@@ -1,7 +1,7 @@
-class SetRedeemableTrueOnVirtualGiftCards < ActiveRecord::Migration
+class SetRedeemableTrueOnVirtualGiftCards < SolidusSupport::Migration[4.2]
   def up
     Spree::VirtualGiftCard.find_each do |gift_card|
-      gift_card.update_attributes!(redeemable: true)
+      gift_card.update!(redeemable: true)
     end
   end
 

data/db/migrate/20151019190731_add_email_send_time_to_virtual_gift_card.rb

@@ -1,4 +1,4 @@
-class AddEmailSendTimeToVirtualGiftCard < ActiveRecord::Migration
+class AddEmailSendTimeToVirtualGiftCard < SolidusSupport::Migration[4.2]
   def change
     add_column :spree_virtual_gift_cards, :send_email_at, :date
     add_column :spree_virtual_gift_cards, :sent_at, :datetime

data/db/migrate/20151109202300_add_deactivated_at_to_gift_card.rb

@@ -1,4 +1,4 @@
-class AddDeactivatedAtToGiftCard < ActiveRecord::Migration
+class AddDeactivatedAtToGiftCard < SolidusSupport::Migration[4.2]
   def change
     add_column :spree_virtual_gift_cards, :deactivated_at, :datetime
   end

data/db/migrate/20151110202752_add_inventory_unit_to_gift_card.rb

@@ -1,4 +1,4 @@
-class AddInventoryUnitToGiftCard < ActiveRecord::Migration
+class AddInventoryUnitToGiftCard < SolidusSupport::Migration[4.2]
   def change
     add_column :spree_virtual_gift_cards, :inventory_unit_id, :integer
   end

data/db/migrate/20151111211220_backfill_inventory_units_on_gift_card.rb

@@ -1,4 +1,4 @@
-class BackfillInventoryUnitsOnGiftCard < ActiveRecord::Migration
+class BackfillInventoryUnitsOnGiftCard < SolidusSupport::Migration[4.2]
   def up
     gift_card_products = Spree::Product.where(gift_card: true)
 
@@ -11,7 +11,7 @@ class BackfillInventoryUnitsOnGiftCard < ActiveRecord::Migration
 
           line_item.gift_cards.each_with_index do |gift_card, i|
             inventory_unit = inventory_units[i]
-            gift_card.update_attributes!(inventory_unit: inventory_unit)
+            gift_card.update!(inventory_unit: inventory_unit)
             say "Updating gift card #{gift_card.id} to have inventory unit #{inventory_unit.id}"
           end
         else

data/lib/generators/solidus_virtual_gift_card/install/install_generator.rb

@@ -9,7 +9,7 @@ module SolidusVirtualGiftCard
       end
 
       def include_seed_data
-        append_file "db/seeds.rb", <<-SEEDS
+        append_file 'db/seeds.rb', <<-SEEDS
 \n
 SpreeVirtualGiftCard::Engine.load_seed if defined?(SpreeVirtualGiftCard::Engine)
         SEEDS

data/lib/solidus_virtual_gift_card.rb

@@ -1,2 +1,3 @@
 require 'spree_core'
+require 'deface'
 require 'spree_virtual_gift_card/engine'

data/lib/spree_virtual_gift_card/engine.rb

@@ -1,16 +1,16 @@
 module SpreeVirtualGiftCard
   class Engine < Rails::Engine
-    require "solidus_core"
+    require 'solidus_core'
 
     isolate_namespace Spree
-    engine_name "solidus_virtual_gift_card"
+    engine_name 'solidus_virtual_gift_card'
 
     config.generators do |g|
       g.test_framework :rspec
     end
 
     def self.activate
-      Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_decorator*.rb")) do |c|
+      Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)
       end
     end

data/lib/spree_virtual_gift_card/factories.rb

@@ -1,14 +1,14 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :store_credit_gift_card_category, class: Spree::StoreCreditCategory do
-    name Spree::StoreCreditCategory::GIFT_CARD_CATEGORY_NAME
+    name { Spree::StoreCreditCategory::GIFT_CARD_CATEGORY_NAME }
   end
 
   factory :virtual_gift_card, class: Spree::VirtualGiftCard do
     association :line_item, factory: :line_item
-    amount 25.0
-    currency "USD"
-    recipient_name "Tom Riddle"
-    recipient_email "me@lordvoldemort.com"
+    amount { 25.0 }
+    currency { 'USD' }
+    recipient_name { 'Tom Riddle' }
+    recipient_email { 'me@lordvoldemort.com' }
 
     factory :redeemable_virtual_gift_card do
       association :purchaser, factory: :user
@@ -17,7 +17,7 @@ FactoryGirl.define do
           create(:inventory_unit, line_item: gift_card.line_item)
       end
 
-      redeemable true
+      redeemable { true }
 
       before(:create) do |gift_card, evaluator|
         gift_card.redemption_code = gift_card.send(:generate_unique_redemption_code)

data/lib/tasks/send_gift_card_emails.rake

@@ -1,5 +1,5 @@
 namespace :solidus_virtual_gift_card do
-  desc "Send todays gift card emails"
+  desc 'Send todays gift card emails'
   task :send_current_emails => :environment do
     Spree::VirtualGiftCard.where(send_email_at: Date.today, sent_at: nil, redeemable: true).find_each do |gift_card|
       gift_card.send_email

data/solidus_virtual_gift_card.gemspec

@@ -2,32 +2,34 @@
 
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
-  s.name        = "solidus_virtual_gift_card"
-  s.version     = "1.2.0"
+  s.name        = 'solidus_virtual_gift_card'
+  s.version     = '1.3.0'
   s.summary     = "Virtual gift card for purchase, drops into the user's account as store credit"
-  s.required_ruby_version = ">= 2.1"
+  s.required_ruby_version = ">= 2.2.2"
 
-  s.author    = "Solidus Team"
-  s.email     = "contact@solidus.io"
-  s.homepage  = "https://solidus.io"
-  s.license   = "BSD-3-Clause"
+  s.author    = 'Solidus Team'
+  s.email     = 'contact@solidus.io'
+  s.homepage  = 'https://solidus.io'
+  s.license   = 'BSD-3-Clause'
 
   s.files       = `git ls-files`.split("\n")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.require_path = "lib"
-  s.requirements << "none"
+  s.require_path = 'lib'
+  s.requirements << 'none'
 
-  s.add_dependency "solidus", "~> 1.2.0"
-  s.add_dependency "deface"
+  s.add_dependency "solidus", [">= 1.2", "< 3"]
+  s.add_dependency 'deface'
 
-  s.add_development_dependency "rspec-rails", "~> 3.2"
-  s.add_development_dependency "simplecov"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "sass-rails"
-  s.add_development_dependency "coffee-rails"
-  s.add_development_dependency "factory_girl"
-  s.add_development_dependency "capybara"
-  s.add_development_dependency "poltergeist"
-  s.add_development_dependency "database_cleaner"
-  s.add_development_dependency "ffaker"
+  s.add_development_dependency 'rspec-rails', '~> 4.0.0.beta2'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'sass-rails'
+  s.add_development_dependency 'coffee-rails'
+  s.add_development_dependency 'factory_bot'
+  s.add_development_dependency 'capybara', '~> 2.18'
+  s.add_development_dependency 'poltergeist'
+  s.add_development_dependency 'solidus_support'
+  s.add_development_dependency 'database_cleaner'
+  s.add_development_dependency 'webdrivers'
+  s.add_development_dependency 'ffaker'
 end