solidus_virtual_gift_card 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d68ab9a6fbe5f3e13073ab38d343df394def740a
-  data.tar.gz: 1ef7434bca9095d79f2889e46232725d85d6aab5
+  metadata.gz: ea5a0d37ac45be094a61721f9f91b948a4713063
+  data.tar.gz: 31f391fb4340bbded183df0bd9fdd5e828c12de5
 SHA512:
-  metadata.gz: 7d2212e47e0a8463e009165fa50c4eaa27ec63f4b131c874919c3b479f18454d0012199a6d4034e78c5d161426eade5176d0c41c27a99cd584d72618a81fb371
-  data.tar.gz: 9636919f4bfbb68ff3b34509b952971d113147e47a61de9490a73b1c3c47d326a0e2dce7a60bf26bbc34bb52ed719c1f9b41a50162287a142775b04118235fb1
+  metadata.gz: 652d0b4ace4f835d099d5f518bdca86fb708a809198fa08a7cfad4f0c8011f472c8f8a89e9dc0572e8b76f10e36818aae20b875f2ea210440d73e8d839aeef53
+  data.tar.gz: 78cd94b6aa0d3e4b89b937ffdbabc83af98940ef1b42edff365ff30600c9787e29c5ac9715d3141d65d6c43e22ca65bcedb262af5150c753ae224f2cae4e8873

data/.travis.yml

@@ -0,0 +1,8 @@
+sudo: false
+language: ruby
+env:
+  matrix:
+    - SOLIDUS_BRANCH=v1.2 DB=mysql
+    - SOLIDUS_BRANCH=v1.2 DB=postgres
+rvm:
+  - 2.1.8

data/Gemfile

@@ -1,11 +1,14 @@
 source "https://rubygems.org"
 
-gem "solidus", github: "solidusio/solidus", branch: "master"
-gem "solidus_auth_devise", "~> 1.0"
+branch = ENV.fetch('SOLIDUS_BRANCH', 'master')
+gem "solidus", github: "solidusio/solidus", branch: branch
+gem "solidus_auth_devise"
+
+gem 'pg'
+gem 'mysql2'
 
 group :test, :development do
-  gem "pry-byebug"
-  gem 'selenium-webdriver'
+  gem 'pry-rails'
 end
 
 gemspec

data/README.md

@@ -7,7 +7,7 @@ A virtual gift card implementation for Solidus.
 * The virtual gift card codes can be used to add store credit to a user's
   account.
 
-[![Circle CI](https://circleci.com/gh/solidusio/solidus_virtual_gift_card/tree/master.svg?style=shield)](https://circleci.com/gh/solidusio/solidus_virtual_gift_card/tree/master)
+[![Build Status](https://travis-ci.org/solidusio/solidus_virtual_gift_card.svg?branch=master)](https://travis-ci.org/solidusio/solidus_virtual_gift_card)
 
 Installation
 ------------

data/app/assets/stylesheets/spree/backend/solidus_virtual_gift_card.css

@@ -1,11 +0,0 @@
-.gift-card-code-lookup {
-  margin-bottom: 30px;
-}
-
-.lookup-gift-card-button {
-  margin-top: 15px;
-}
-
-.last-email-sent {
-  margin-bottom: 10px;
-}

data/app/controllers/spree/admin/gift_cards_controller.rb

@@ -1,8 +1,8 @@
 class Spree::Admin::GiftCardsController < Spree::Admin::BaseController
   before_filter :load_user, only: [:lookup, :redeem]
   before_filter :load_gift_card_for_redemption, only: [:redeem]
-  before_filter :load_gift_card_by_id, only: [:edit, :update, :send_email]
-  before_filter :load_order, only: [:edit, :update]
+  before_filter :load_gift_card_by_id, only: [:edit, :update, :send_email, :deactivate]
+  before_filter :load_order, only: [:edit, :update, :deactivate]
 
   def index
     @search = Spree::VirtualGiftCard.purchased.search(params[:q])
@@ -35,6 +35,19 @@ class Spree::Admin::GiftCardsController < Spree::Admin::BaseController
     end
   end
 
+  def deactivate
+    if @gift_card.deactivate
+      flash[:success] = Spree.t("admin.gift_cards.deactivated_gift_card")
+      redirect_to edit_admin_order_path(@order)
+    else
+      flash[:error] = @gift_card.errors.full_messages.join(", ").presence || Spree.t("admin.gift_cards.errors.unable_to_reimburse_gift_card")
+      redirect_to edit_admin_order_gift_card_path(@order, @gift_card)
+    end
+  rescue Spree::Reimbursement::IncompleteReimbursementError
+    flash[:error] = Spree.t("admin.gift_cards.errors.unable_to_reimburse_gift_card")
+    redirect_to edit_admin_order_gift_card_path(@order, @gift_card)
+  end
+
   def send_email
     @gift_card.send_email
     redirect_to :back

data/app/mailers/spree/gift_card_mailer.rb

@@ -2,8 +2,8 @@ class Spree::GiftCardMailer < Spree::BaseMailer
   def gift_card_email(gift_card)
     @gift_card = gift_card.respond_to?(:id) ? gift_card : Spree::VirtualGiftCard.find(gift_card)
     @order = @gift_card.line_item.order
-    send_to_address = @gift_card.recipient_email || @order.email
+    send_to_address = @gift_card.recipient_email.presence || @order.email
     subject = "#{Spree::Store.current.name} #{Spree.t('gift_card_mailer.gift_card_email.subject')}"
-    mail(to: send_to_address, from: from_address, subject: subject)
+    mail(to: send_to_address, from: from_address(Spree::Store.current), subject: subject)
   end
 end

data/app/models/concerns/spree/gift_cards/inventory_unit_concerns.rb

@@ -0,0 +1,10 @@
+module Spree
+  module GiftCards::InventoryUnitConcerns
+    extend ActiveSupport::Concern
+
+    included do
+      has_one :gift_card, class_name: 'Spree::VirtualGiftCard'
+    end
+  end
+end
+

data/app/models/concerns/spree/gift_cards/order_concerns.rb

@@ -23,8 +23,9 @@ module Spree
 
       def finalize!
         super
-        gift_cards.each do |gift_card|
-          gift_card.make_redeemable!(purchaser: user)
+        inventory_units = self.inventory_units
+        gift_cards.each_with_index do |gift_card, index|
+          gift_card.make_redeemable!(purchaser: user, inventory_unit: inventory_units[index])
         end
       end
 

data/app/models/spree/inventory_unit_decorator.rb

@@ -0,0 +1 @@
+Spree::InventoryUnit.include Spree::GiftCards::InventoryUnitConcerns

data/app/models/spree/virtual_gift_card.rb

@@ -5,6 +5,8 @@ class Spree::VirtualGiftCard < ActiveRecord::Base
   belongs_to :purchaser, class_name: 'Spree::User'
   belongs_to :redeemer, class_name: 'Spree::User'
   belongs_to :line_item, class_name: 'Spree::LineItem'
+  belongs_to :inventory_unit, class_name: 'Spree::InventoryUnit'
+  has_one :order, through: :line_item
 
   validates :amount, numericality: { greater_than: 0 }
   validates_uniqueness_of :redemption_code, conditions: -> { where(redeemed_at: nil, redeemable: true) }
@@ -22,6 +24,10 @@ class Spree::VirtualGiftCard < ActiveRecord::Base
     redeemed_at.present?
   end
 
+  def deactivated?
+    deactivated_at.present?
+  end
+
   def redeem(redeemer)
     return false if redeemed? || !redeemable?
     create_store_credit!({
@@ -36,8 +42,17 @@ class Spree::VirtualGiftCard < ActiveRecord::Base
     self.update_attributes( redeemed_at: Time.now, redeemer: redeemer )
   end
 
-  def make_redeemable!(purchaser:)
-    update_attributes!(redeemable: true, purchaser: purchaser, redemption_code: (self.redemption_code || generate_unique_redemption_code))
+  def make_redeemable!(purchaser:, inventory_unit:)
+    update_attributes!(redeemable: true, purchaser: purchaser, inventory_unit: inventory_unit, redemption_code: (self.redemption_code || generate_unique_redemption_code))
+  end
+
+  def deactivate
+    update_attributes(redeemable: false, deactivated_at: Time.now) &&
+      cancel_and_reimburse_inventory_unit
+  end
+
+  def can_deactivate?
+    order.completed? && order.paid? && !deactivated?
   end
 
   def memo
@@ -81,6 +96,10 @@ class Spree::VirtualGiftCard < ActiveRecord::Base
     redeemed_at.localtime.strftime("%F %I:%M%p") if redeemed_at
   end
 
+  def formatted_deactivated_at
+    deactivated_at.localtime.strftime("%F %I:%M%p") if deactivated_at
+  end
+
   def store_credit_category
     Spree::StoreCreditCategory.where(name: Spree::StoreCreditCategory::GIFT_CARD_CATEGORY_NAME).first
   end
@@ -96,6 +115,12 @@ class Spree::VirtualGiftCard < ActiveRecord::Base
 
   private
 
+  def cancel_and_reimburse_inventory_unit
+    cancellation = Spree::OrderCancellations.new(line_item.order)
+    cancellation.cancel_unit(inventory_unit)
+    !!cancellation.reimburse_units([inventory_unit])
+  end
+
   def generate_unique_redemption_code
     redemption_code = Spree::RedemptionCodeGenerator.generate_redemption_code
 

data/app/overrides/admin_user_sub_menu.rb

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

data/app/overrides/spree/admin/products/_form/add_gift_card.html.erb.deface

@@ -0,0 +1,8 @@
+<!-- insert_bottom '[data-hook="admin_product_form_right"]' -->
+<div class="field">
+  <%= f.check_box(:gift_card) %>
+  <%= f.label :gift_card, Spree.t("admin.gift_cards.gift_card") %>
+  <span class="info">
+    <%= Spree.t("admin.gift_cards.convert_product_label") %>
+  </span>
+</div>

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

@@ -1,33 +1,41 @@
-<div class='gift-card-code-lookup'>
-  <%= search_form_for @search, url: admin_gift_cards_path(@search) do |f| %>
-    <div class="four columns">
-      <div class="field">
-        <%= label_tag nil, "Redemption Code" %>
-        <%= f.text_field :redemption_code_cont, :size => 27 %>
+<% content_for :table_filter_title do %>
+  <%= Spree.t(:search) %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <div class='gift-card-code-lookup'>
+    <%= search_form_for @search, url: admin_gift_cards_path(@search) do |f| %>
+      <div class="alpha four columns">
+        <div class="field">
+          <%= label_tag nil, "Redemption Code" %>
+          <%= f.text_field :redemption_code_cont, size: 27 %>
+        </div>
+      </div>
+      <div class="four columns">
+        <div class="field">
+          <%= label_tag nil, "Recipient Email" %>
+          <%= f.text_field :recipient_email_cont, size: 25 %>
+        </div>
       </div>
-    </div>
-    <div class="four columns">
-      <div class="field">
-        <%= label_tag nil, "Recipient Email" %>
-        <%= f.text_field :recipient_email_cont, :size => 25 %>
+      <div class="four columns">
+        <div class="field">
+          <%= label_tag nil, "Order Number" %>
+          <%= f.text_field :line_item_order_number_cont, size: 25 %>
+        </div>
       </div>
-    </div>
-    <div class="four columns">
-      <div class="field">
-        <%= label_tag nil, "Order Number" %>
-        <%= f.text_field :line_item_order_number_cont, :size => 25 %>
+      <div class="omega four columns">
+        <div class="field">
+          <%= label_tag nil, "Send Date" %>
+          <%= f.text_field :sent_at_or_send_email_at_is, class: 'datepicker', size: 25 %>
+        </div>
       </div>
-    </div>
-    <div class="three columns">
-      <div class="field">
-        <%= label_tag nil, "Send Date" %>
-        <%= f.text_field :sent_at_or_send_email_at_is, :class => 'datepicker', :size => 25 %>
+
+      <div class="clearfix"></div>
+
+      <div class="actions filter-actions">
+        <%= button 'Lookup Gift Card', 'search' %>
       </div>
-    </div>
-    <div class="clearfix"></div>
-    <div class="actions filter-actions">
-      <%= button 'Lookup Gift Card', 'search', class: 'lookup-gift-card-button' %>
-    </div>
-  <% end %>
+    <% end %>
   </div>
+<% end %>
 

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

@@ -67,15 +67,23 @@
           <%= f.text_field :send_email_at, :class => 'datepicker datepicker-from giftcard-datepicker' %>
           <% end %>
         <% end %>
+
+        <% if @gift_card.deactivated_at %>
+          <div class="deactivated-at">
+            Deactivated at: <%= @gift_card.formatted_deactivated_at %>
+          </div>
+        <% end %>
       </div>
     </div>
 
     <%= render :partial => 'spree/admin/shared/edit_resource_links', locals: { collection_url: edit_admin_order_path(@order) } %>
   </fieldset>
+<% end %>
+
 
-  <div class="form-buttons filter-actions actions" data-hook="buttons">
-    <% if @order.completed? %>
-      <%= button_link_to "Send email now", send_email_admin_order_gift_card_path(@order, @gift_card), :icon => 'email', :data => { :confirm => "Any changes that have not been updated will not send" } %>
-    <% end %>
+<% if @gift_card.can_deactivate? && can?(:deactivate, @gift_card) %>
+  <div class="form-buttons filter-actions actions gift-card-actions" data-hook="buttons">
+      <%= button_link_to "Send email now", send_email_admin_order_gift_card_path(@order, @gift_card), :icon => 'email', :method => 'put', :data => { :confirm => "Any changes that have not been updated will not send" } %>
+      <%= button_link_to "Deactivate", deactivate_admin_order_gift_card_path(@order, @gift_card), :icon => 'ban', :method => 'put', :data => { :confirm => "Are you sure you want to deactivate the gift card?" } %>
   </div>
 <% end %>

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

@@ -1,5 +1,11 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:listing_gift_cards) %>
+<% end %>
+
 <%= render partial: 'lookup_form' %>
-  <%= paginate @gift_cards %>
+
+<%= paginate @gift_cards %>
+
 <% if @gift_cards.any? %>
   <table class="index">
     <thead>

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

@@ -1,2 +1,7 @@
 <br><strong><%= Spree.t('admin.gift_cards.redemption_code') %>:</strong> <%= gift_card.redemption_code %>
-<br><%= link_to '(Edit Details)', edit_admin_order_gift_card_path(@order, gift_card), class: 'edit-gift-card-details' %>
+<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' %>

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

@@ -1,10 +1,6 @@
-<% if request.fullpath.match(/^\/admin\/users/) %>
-  <% content_for :sub_menu do %>
-    <ul id="sub_nav" class="inline-menu">
-      <%= tab :users %>
-      <% if can?(:display, Spree::VirtualGiftCard) %>
-        <%= tab :gift_cards, :match_path => '/users/gift_cards' %>
-      <% end %>
-    </ul>
+<ul class="admin-subnav">
+  <%= tab :users, match_path: /\/users$/ %>
+  <% if can?(:display, Spree::VirtualGiftCard) %>
+    <%= tab :gift_cards, match_path: "/users/gift_cards" %>
   <% end %>
-<% end %>
+</ul>

data/config/locales/en.yml

@@ -3,11 +3,17 @@ en:
   spree:
     admin:
       gift_cards:
+        convert_product_label: "Turn this product into a gift card?"
+        deactivated_gift_card: "Gift card deactivated"
         editing_gift_card: "Editing Gift Card"
         gift_card: "Gift Card"
         gift_card_details: "Gift Card Details"
         gift_card_originator: "Gift Card - Order #%{order_number}"
         gift_card_updated: "Gift card updated!"
+        gift_message: "Gift Message"
+        purchaser_name: "Purchaser Name"
+        recipient_email: "Recipient Email"
+        recipient_name: "Recipient Name"
         redeem: "Redeem"
         redeem_gift_card: "Redeem Gift Card"
         redeemed_gift_card: "Redeemed Gift Card"
@@ -15,10 +21,15 @@ en:
         errors:
           not_found: "Gift card was not found"
           please_try_again: "Please try again"
+          unable_to_deactivate_gift_card: "Unable to deactivate gift card"
           unable_to_redeem_gift_card: "Unable to redeem gift card"
+          unable_to_reimburse_gift_card: "Unable to reimburse gift card"
+      tab:
+        gift_cards: "Gift Cards"
     gift_card_mailer:
       gift_card_email:
         dear_customer: "Dear customer"
         your_gift_card_code: "Here is your gift card code"
         gift_card_code: "Gift card code: %{code}"
         subject: "Your gift card code"
+    listing_gift_cards: "Listing Gift Cards"

data/config/locales/it.yml

@@ -0,0 +1,27 @@
+---
+it:
+  spree:
+    admin:
+      gift_cards:
+        editing_gift_card: "Modifica Gift Card"
+        deactivated_gift_card: "Gift Card disattivata"
+        gift_card: "Gift Card"
+        gift_card_details: "Dettagli Gift Card"
+        gift_card_originator: "Gift Card - Ordine #%{order_number}"
+        gift_card_updated: "Gift Card aggiornata!"
+        redeem: "Riscuoti"
+        redeem_gift_card: "Utilizza Gift Card"
+        redeemed_gift_card: "Utilizza la tua Gift Card"
+        redemption_code: "Codice Gift Card"
+        errors:
+          not_found: "La Gift Card non è stata trovata"
+          please_try_again: "Si prega di riprovare"
+          unable_to_deactivate_gift_card: "Impossibile disattivate la Gift Card"
+          unable_to_redeem_gift_card: "Impossibile utilizzare la Gift Card"
+          unable_to_reimburse_gift_card: "Impossibile rimborsare la Gift Card"
+    gift_card_mailer:
+      gift_card_email:
+        dear_customer: "Gentile CLiente"
+        your_gift_card_code: "ecco il codice della tua Gift Card"
+        gift_card_code: "Codice Gift Card: %{code}"
+        subject: "Il codice della tua Gift Card"

data/config/routes.rb

@@ -15,7 +15,8 @@ Spree::Core::Engine.routes.draw do
     resources :orders, only: [] do
       resources :gift_cards, only: [:edit, :update] do
         member do
-          get :send_email
+          put :send_email
+          put :deactivate
         end
       end
     end

data/db/migrate/20151109202300_add_deactivated_at_to_gift_card.rb

@@ -0,0 +1,5 @@
+class AddDeactivatedAtToGiftCard < ActiveRecord::Migration
+  def change
+    add_column :spree_virtual_gift_cards, :deactivated_at, :datetime
+  end
+end

data/db/migrate/20151110202752_add_inventory_unit_to_gift_card.rb

@@ -0,0 +1,5 @@
+class AddInventoryUnitToGiftCard < ActiveRecord::Migration
+  def change
+    add_column :spree_virtual_gift_cards, :inventory_unit_id, :integer
+  end
+end

data/db/migrate/20151111211220_backfill_inventory_units_on_gift_card.rb

@@ -0,0 +1,27 @@
+class BackfillInventoryUnitsOnGiftCard < ActiveRecord::Migration
+  def up
+    gift_card_products = Spree::Product.where(gift_card: true)
+
+    gift_card_products.find_each do |product|
+      line_items = product.line_items
+
+      line_items.find_each do |line_item|
+        if line_item.order.completed? && !line_item.gift_cards.all? {|gc| gc.inventory_unit.present? }
+          inventory_units = line_item.inventory_units
+
+          line_item.gift_cards.each_with_index do |gift_card, i|
+            inventory_unit = inventory_units[i]
+            gift_card.update_attributes!(inventory_unit: inventory_unit)
+            say "Updating gift card #{gift_card.id} to have inventory unit #{inventory_unit.id}"
+          end
+        else
+          say "Skipping line_item #{line_item.id}. Order incomplete or gift cards associated to inventory units"
+        end
+      end
+    end
+  end
+
+  def down
+    Spree::VirtualGiftCard.update_all(inventory_unit_id: nil)
+  end
+end

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

@@ -8,10 +8,6 @@ module SolidusVirtualGiftCard
         append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/solidus_virtual_gift_card\n"
       end
 
-      def add_stylesheets
-        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/solidus_virtual_gift_card\n", before: /\*\//, verbose: true
-      end
-
       def include_seed_data
         append_file "db/seeds.rb", <<-SEEDS
 \n

data/lib/spree_virtual_gift_card/factories.rb

@@ -12,6 +12,11 @@ FactoryGirl.define do
 
     factory :redeemable_virtual_gift_card do
       association :purchaser, factory: :user
+      inventory_unit do |gift_card|
+        gift_card.line_item.inventory_units.select{|iu| iu.gift_card.nil? }.first ||
+          create(:inventory_unit, line_item: gift_card.line_item)
+      end
+
       redeemable true
 
       before(:create) do |gift_card, evaluator|

data/solidus_virtual_gift_card.gemspec

@@ -3,21 +3,22 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = "solidus_virtual_gift_card"
-  s.version     = "1.0.1"
+  s.version     = "1.2.0"
   s.summary     = "Virtual gift card for purchase, drops into the user's account as store credit"
   s.required_ruby_version = ">= 2.1"
 
-  s.author    = "Bonobos"
-  s.email     = "engineering@bonobos.com"
-  s.homepage  = "http://www.bonobos.com"
-  s.license   = %q{BSD-3}
+  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.add_dependency "solidus", [">= 1.0.0", "< 1.2.0"]
+  s.add_dependency "solidus", "~> 1.2.0"
+  s.add_dependency "deface"
 
   s.add_development_dependency "rspec-rails", "~> 3.2"
   s.add_development_dependency "simplecov"
@@ -26,6 +27,7 @@ Gem::Specification.new do |s|
   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"
 end

data/spec/controllers/spree/admin/gift_cards_controller_spec.rb

@@ -24,6 +24,62 @@ describe Spree::Admin::GiftCardsController do
     end
   end
 
+  describe 'PUT deactivate' do
+    let(:user) { create :user }
+    let!(:gift_card) { create(:redeemable_virtual_gift_card, line_item: order.line_items.first) }
+    let(:order) { create(:shipped_order, line_items_count: 1) }
+    let!(:default_refund_reason) { Spree::RefundReason.find_or_create_by!(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false) }
+
+    subject { spree_put :deactivate, id: gift_card.id, order_id: order.number  }
+
+    context "when successful" do
+      it "redirects to the admin order edit page" do
+        expect(subject).to redirect_to spree.edit_admin_order_path(order)
+      end
+
+      it "deactivates the gift card" do
+        subject
+        expect(gift_card.reload.deactivated_at).to be_present
+      end
+    end
+
+    context "when deactivating fails without raising an exception" do
+      before { expect_any_instance_of(Spree::VirtualGiftCard).to receive(:deactivate).and_return(false) }
+
+      it "does not deactivate the gift card" do
+        subject
+        expect(gift_card.reload.deactivated_at).to be_nil
+      end
+
+      it "redirects to gift card edit page" do
+        expect(subject).to redirect_to spree.edit_admin_order_gift_card_path(order, gift_card)
+      end
+
+      it "sets the flash message" do
+        subject
+        expect(flash[:error]).to eq Spree.t('admin.gift_cards.errors.unable_to_reimburse_gift_card')
+      end
+    end
+
+    context "when deactivating fails from reimbursement" do
+      before { expect_any_instance_of(Spree::VirtualGiftCard).to receive(:deactivate).and_raise(Spree::Reimbursement::IncompleteReimbursementError) }
+
+      it "does not deactivate the gift card" do
+        subject
+        expect(gift_card.reload.deactivated_at).to be_nil
+      end
+
+      it "redirects to gift card edit page" do
+        expect(subject).to redirect_to spree.edit_admin_order_gift_card_path(order, gift_card)
+      end
+
+      it "sets the flash message" do
+        subject
+        expect(flash[:error]).to eq Spree.t('admin.gift_cards.errors.unable_to_reimburse_gift_card')
+      end
+    end
+  end
+
   describe 'POST redeem' do
     let(:user) { create :user }
     let(:gift_card) { create(:redeemable_virtual_gift_card) }

data/spec/features/admin/products_card_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe 'Gift Cards', type: :feature, js: true do
+  stub_authorization!
+
+  let(:admin_user) { create(:admin_user) }
+
+  before do
+    allow_any_instance_of(Spree::Admin::BaseController).to receive(:spree_current_user).and_return(admin_user)
+  end
+
+  describe "edit product" do
+    let(:product) { create(:product, available_on: 1.year.from_now) }
+
+    it "can mark a product as a gift card" do
+      visit spree.admin_product_path(product)
+
+      find('#product_gift_card').click
+
+      click_on 'Update'
+
+      expect(page).to have_content("successfully updated!")
+      expect(page).to have_field('product_gift_card', checked: true)
+    end
+  end
+end

data/spec/mailers/spree/gift_card_mailer_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Spree::GiftCardMailer, type: :mailer do
+  context '#gift_card_email' do
+    let(:gift_card) { create(:redeemable_virtual_gift_card) }
+
+    subject { Spree::GiftCardMailer.gift_card_email(gift_card) }
+
+    context "the recipient email is blank" do
+      before do
+        gift_card.update_attributes!(recipient_email: "")
+        gift_card.line_item.order.update_attributes!(email: "gift_card_tester@example.com")
+      end
+
+      it "uses the email associated with the order" do
+        expect(subject.to).to contain_exactly('gift_card_tester@example.com')
+      end
+    end
+  end
+end

data/spec/models/spree/line_item_spec.rb

@@ -39,7 +39,7 @@ describe Spree::LineItem do
     end
 
     it 'contains the correct keys and values' do
-      gift_card_details = subject.first
+      gift_card_details = subject.detect{|x| x[:redemption_code] == gift_card.formatted_redemption_code }
       expect(gift_card_details[:amount]).to eq gift_card.formatted_amount
       expect(gift_card_details[:redemption_code]).to eq gift_card.formatted_redemption_code
       expect(gift_card_details[:recipient_email]).to eq gift_card.recipient_email

data/spec/models/spree/virtual_gift_card_spec.rb

@@ -19,10 +19,97 @@ describe Spree::VirtualGiftCard do
     end
   end
 
+  describe "#can_deactivate?" do
+    subject { gift_card.can_deactivate? }
+
+    let!(:default_refund_reason) { Spree::RefundReason.find_or_create_by!(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false) }
+    let(:gift_card) { create(:redeemable_virtual_gift_card, line_item: order.line_items.first) }
+
+    context "the order is not complete" do
+      let(:order) { create(:order_with_line_items, line_items_count: 1) }
+
+      it "can't deactivate" do
+        expect(subject).to be_falsey
+      end
+    end
+
+    context "gift card is already deactivated" do
+      before { gift_card.deactivate }
+      let(:order) { create(:shipped_order, line_items_count: 1) }
+
+      it "can't deactivate" do
+        expect(subject).to be_falsey
+      end
+    end
+
+    context "order is not paid" do
+      let(:order) { create(:order_with_line_items, line_items_count: 1) }
+
+      it "can't deactivate" do
+        expect(subject).to be_falsey
+      end
+    end
+
+    context "order is paid and complete and gift card is active" do
+      let(:order) { create(:shipped_order, line_items_count: 1) }
+
+      it "can deactivate" do
+        expect(subject).to be_truthy
+      end
+    end
+  end
+
+  describe "#deactivate" do
+    let!(:gift_card) { create(:redeemable_virtual_gift_card, line_item: order.line_items.first) }
+    let(:order) { create(:shipped_order, line_items_count: 1) }
+    let!(:default_refund_reason) { Spree::RefundReason.find_or_create_by!(name: Spree::RefundReason::RETURN_PROCESSING_REASON, mutable: false) }
+    subject { gift_card.deactivate }
+
+    it "makes it not redeemable" do
+      subject
+      expect(gift_card.reload.redeemable?).to be_falsey
+    end
+
+    it "sets the deactivated_at" do
+      subject
+      expect(gift_card.reload.deactivated_at).to be_present
+    end
+
+    it "#deactivated? returns true" do
+      subject
+      expect(gift_card.reload.deactivated?).to be_truthy
+    end
+
+    it "cancels the inventory unit" do
+      subject
+      expect(gift_card.inventory_unit.unit_cancel).to be_present
+    end
+
+    it "creates a reimbursement" do
+      expect { subject }.to change { Spree::Reimbursement.count }.by(1)
+    end
+
+    it "returns true" do
+      expect(subject).to be_truthy
+    end
+  end
+
   describe '#make_redeemable!' do
     let(:user) { create(:user) }
     let(:gift_card) { create(:virtual_gift_card) }
-    subject { gift_card.make_redeemable!(purchaser: user) }
+    let(:order) { create(:shipped_order, line_items_count: 1) }
+    let(:inventory_unit) { order.inventory_units.first }
+    subject { gift_card.make_redeemable!(purchaser: user, inventory_unit: inventory_unit) }
+
+    it "sets the purchaser" do
+      subject
+      expect(gift_card.purchaser).to be user
+    end
+
+    it "sets the inventory unit" do
+      subject
+      expect(gift_card.inventory_unit).to be inventory_unit
+    end
 
     context 'no collision on redemption code' do
       it 'sets a redemption code' do
@@ -85,6 +172,19 @@ describe Spree::VirtualGiftCard do
     end
   end
 
+  describe '#deactivated?' do
+    let(:gift_card) { build(:virtual_gift_card) }
+
+    it 'is deactivated if there is a deactivated_at set' do
+      gift_card.deactivated_at = Time.now
+      expect(gift_card.deactivated?).to be true
+    end
+
+    it 'is not deactivated if there is no timestamp for deactivated_at' do
+      expect(gift_card.deactivated?).to be false
+    end
+  end
+
   describe '#redeem' do
     let(:gift_card) { create(:redeemable_virtual_gift_card) }
     let(:redeemer) { create(:user) }
@@ -108,6 +208,26 @@ describe Spree::VirtualGiftCard do
       end
     end
 
+    context 'it has been deactivated' do
+      before do
+        expect(gift_card).to receive(:cancel_and_reimburse_inventory_unit).and_return(true)
+        gift_card.deactivate
+      end
+
+      it 'should return false' do
+        expect(subject).to be false
+      end
+
+      context 'does nothing to the gift card' do
+        it 'should not create a store credit' do
+          expect(gift_card.store_credit).not_to be_present
+        end
+
+        it 'should not update the gift card' do
+          expect { subject }.to_not change{ gift_card }
+        end
+      end
+    end
 
     context 'it has already been redeemed' do
       before { gift_card.redeemed_at = Date.yesterday }

data/spec/spec_helper.rb

@@ -30,6 +30,12 @@ require 'cancan/matchers'
 
 require "spree_virtual_gift_card/factories"
 
+require "capybara/poltergeist"
+Capybara.register_driver :poltergeist do |app|
+  Capybara::Poltergeist::Driver.new(app, timeout: 120)
+end
+Capybara.javascript_driver = :poltergeist
+
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
 
 RSpec.configure do |config|
@@ -52,16 +58,17 @@ RSpec.configure do |config|
   config.include Spree::TestingSupport::ControllerRequests, type: :controller
   config.include Spree::TestingSupport::UrlHelpers, type: :controller
 
-  # Ensure Suite is set to use transactions for speed.
   config.before :suite do
-    DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with :truncation
   end
 
-  # Before each spec check if it is a Javascript test and switch between using
-  # database transactions or not where necessary.
   config.before :each do |example|
-    DatabaseCleaner.strategy = :truncation
+    if RSpec.current_example.metadata[:js]
+      page.driver.browser.url_blacklist = ['http://fonts.googleapis.com']
+      DatabaseCleaner.strategy = :truncation
+    else
+      DatabaseCleaner.strategy = :transaction
+    end
     DatabaseCleaner.start
 
     Spree::Api::Config[:requires_authentication] = true
@@ -69,7 +76,14 @@ RSpec.configure do |config|
   end
 
   # After each spec clean the database.
-  config.after :each do
+  config.append_after :each do
     DatabaseCleaner.clean
   end
+
+  if defined?(VersionCake::TestHelpers)
+    config.include VersionCake::TestHelpers, type: :controller
+    config.before(:each, type: :controller) do
+      set_request_version('', 1)
+    end
+  end
 end

metadata

@@ -1,35 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: solidus_virtual_gift_card
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
-- Bonobos
+- Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: deface
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - "<"
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -128,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -157,26 +179,31 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 
-email: engineering@bonobos.com
+email: contact@solidus.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - app/assets/javascripts/spree/backend/solidus_virtual_gift_card.coffee
+- app/assets/javascripts/spree/frontend/solidus_virtual_gift_card.js
 - app/assets/stylesheets/spree/backend/solidus_virtual_gift_card.css
+- app/assets/stylesheets/spree/frontend/solidus_virtual_gift_card.css
 - app/controllers/spree/admin/gift_cards_controller.rb
 - app/controllers/spree/api/gift_cards_controller.rb
 - app/mailers/spree/gift_card_mailer.rb
+- app/models/concerns/spree/gift_cards/inventory_unit_concerns.rb
 - app/models/concerns/spree/gift_cards/line_item_concerns.rb
 - app/models/concerns/spree/gift_cards/order_concerns.rb
 - app/models/concerns/spree/gift_cards/order_contents_concerns.rb
 - app/models/concerns/spree/redemption_code_generator.rb
+- app/models/spree/inventory_unit_decorator.rb
 - app/models/spree/line_item_decorator.rb
 - app/models/spree/order_contents_decorator.rb
 - app/models/spree/order_decorator.rb
@@ -188,6 +215,7 @@ files:
 - app/overrides/admin_item_view_gift_card_codes.rb
 - app/overrides/admin_user_sidebar_store_credits.rb
 - app/overrides/admin_user_sub_menu.rb
+- app/overrides/spree/admin/products/_form/add_gift_card.html.erb.deface
 - app/views/spree/admin/gift_cards/_lookup_form.html.erb
 - app/views/spree/admin/gift_cards/_redemption_form.html.erb
 - app/views/spree/admin/gift_cards/edit.html.erb
@@ -207,6 +235,7 @@ files:
 - config/initializers/line_item_controller_gift_card_details.rb
 - config/initializers/ransack.rb
 - config/locales/en.yml
+- config/locales/it.yml
 - config/routes.rb
 - db/migrate/20140623152903_create_virtual_gift_card.rb
 - db/migrate/20140624175113_seed_gift_card_category.rb
@@ -217,6 +246,9 @@ files:
 - db/migrate/20151013210615_add_active_flag_to_virtual_gift_card.rb
 - db/migrate/20151013214647_set_redeemable_true_on_virtual_gift_cards.rb
 - db/migrate/20151019190731_add_email_send_time_to_virtual_gift_card.rb
+- db/migrate/20151109202300_add_deactivated_at_to_gift_card.rb
+- db/migrate/20151110202752_add_inventory_unit_to_gift_card.rb
+- db/migrate/20151111211220_backfill_inventory_units_on_gift_card.rb
 - db/seeds.rb
 - lib/generators/solidus_virtual_gift_card/install/install_generator.rb
 - lib/solidus_virtual_gift_card.rb
@@ -227,7 +259,9 @@ files:
 - spec/controllers/spree/admin/gift_cards_controller_spec.rb
 - spec/controllers/spree/api/gift_cards_controller_spec.rb
 - spec/features/admin/gift_cards_spec.rb
+- spec/features/admin/products_card_spec.rb
 - spec/lib/tasks/send_gift_card_emails_spec.rb
+- spec/mailers/spree/gift_card_mailer_spec.rb
 - spec/models/concerns/spree/redemption_code_generator_spec.rb
 - spec/models/spree/line_item_spec.rb
 - spec/models/spree/order_contents_spec.rb
@@ -237,9 +271,9 @@ files:
 - spec/models/spree/store_credit_category_spec.rb
 - spec/models/spree/virtual_gift_card_spec.rb
 - spec/spec_helper.rb
-homepage: http://www.bonobos.com
+homepage: https://solidus.io
 licenses:
-- BSD-3
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -258,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Virtual gift card for purchase, drops into the user's account as store credit
@@ -266,7 +300,9 @@ test_files:
 - spec/controllers/spree/admin/gift_cards_controller_spec.rb
 - spec/controllers/spree/api/gift_cards_controller_spec.rb
 - spec/features/admin/gift_cards_spec.rb
+- spec/features/admin/products_card_spec.rb
 - spec/lib/tasks/send_gift_card_emails_spec.rb
+- spec/mailers/spree/gift_card_mailer_spec.rb
 - spec/models/concerns/spree/redemption_code_generator_spec.rb
 - spec/models/spree/line_item_spec.rb
 - spec/models/spree/order_contents_spec.rb