solidus_virtual_gift_card 1.0.0 → 1.0.1

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

@@ -0,0 +1,81 @@
+<script async='true'>GiftCards.setAdminDatepicker()</script>
+
+<% content_for :page_title do %>
+  <%= Spree.t("admin.gift_cards.editing_gift_card") %>
+<% end %>
+
+<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => '' } %>
+
+<%= form_for @gift_card, url: admin_order_gift_card_path(@order, @gift_card) do |f| %>
+  <fieldset>
+    <legend align="center"><%= Spree.t("admin.gift_cards.gift_card_details") %></legend>
+    <div class="row">
+      <label>Amount:</label>
+      <%= @gift_card.formatted_amount %>
+    </div>
+
+    <div class="row">
+      <label>Redemption Code:</label>
+      <%= @gift_card.redemption_code %>
+    </div>
+
+    <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.text_field :recipient_name, class: 'fullwidth' %>
+        <% end %>
+      </div>
+    </div>
+
+    <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.text_field :recipient_email, class: 'fullwidth' %>
+        <% end %>
+      </div>
+    </div>
+
+    <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.text_field :purchaser_name, class: 'fullwidth' %>
+        <% end %>
+      </div>
+    </div>
+
+    <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.text_area :gift_message, class: 'fullwidth', maxlength: '140' %>
+        <% end %>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class="alpha twelve columns">
+        <% if @gift_card.sent_at %>
+          <div class="last-email-sent">
+            Email last sent at: <%= @gift_card.formatted_sent_at %>
+          </div>
+        <% else %>
+          <%= f.field_container :send_email_at do %>
+          <%= f.label :send_email_at, Spree.t('admin.gift_cards.send_email_at') %> <br />
+          <%= f.text_field :send_email_at, :class => 'datepicker datepicker-from giftcard-datepicker' %>
+          <% end %>
+        <% end %>
+      </div>
+    </div>
+
+    <%= render :partial => 'spree/admin/shared/edit_resource_links', locals: { collection_url: edit_admin_order_path(@order) } %>
+  </fieldset>
+
+  <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 %>
+  </div>
+<% end %>

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

@@ -1 +1,40 @@
 <%= render partial: 'lookup_form' %>
+  <%= paginate @gift_cards %>
+<% if @gift_cards.any? %>
+  <table class="index">
+    <thead>
+      <tr>
+        <th class="align-center">Redemption Code</th>
+        <th class="align-center">Amount</th>
+        <th class="align-center">Purchased by</th>
+        <th class="align-center">Purchased at</th>
+        <th class="align-center">Recipient Email</th>
+        <th class="align-center">Date Sent</th>
+        <th class="align-center">Redeemed by</th>
+        <th class="align-center">Redeemed at</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @gift_cards.each do |gift_card| %>
+        <tr>
+          <td class="align-center"><%= gift_card.formatted_redemption_code %></td>
+          <td class="align-center"><%= number_to_currency(gift_card.amount) %></td>
+          <td class="align-center"><%= link_to "#{gift_card.purchaser.email}", edit_admin_user_path(gift_card.purchaser) %></td>
+          <td class="align-center"><%= gift_card.formatted_created_at %></td>
+          <td class="align-center"><%= gift_card.recipient_email %></td>
+          <td class="align-center"><%= gift_card.formatted_sent_at || gift_card.formatted_send_email_at %></td>
+          <% if gift_card.redeemed? %>
+            <td class="align-center"><%= link_to "#{gift_card.redeemer.email}", edit_admin_user_path(gift_card.redeemer) %></td>
+            <td class="align-center"><%= gift_card.formatted_redeemed_at %></td>
+          <% else %>
+            <td class="align-center"></td>
+            <td class="align-center"></td>
+          <% end %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
+
+<%= paginate @gift_cards %>

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

@@ -1,32 +0,0 @@
-<%= render partial: 'spree/admin/shared/sub_menu' %>
-<%= render partial: 'lookup_form' %>
-
-<table class="index">
-  <thead>
-    <tr>
-      <th class="align-center">Redemption Code</th>
-      <th class="align-center">Amount</th>
-      <th class="align-center">Purchased by</th>
-      <th class="align-center">Purchased at</th>
-      <th class="align-center">Redeemed by</th>
-      <th class="align-center">Redeemed at</th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @gift_cards.each do |gift_card| %>
-      <tr>
-        <td class="align-center"><%= gift_card.formatted_redemption_code %></td>
-        <td class="align-center"><%= number_to_currency(gift_card.amount) %></td>
-        <td class="align-center"><%= link_to "#{gift_card.purchaser.email}", edit_admin_user_path(gift_card.purchaser) %></td>
-        <td class="align-center"><%= gift_card.created_at.localtime.strftime("%F %I:%M%p") %></td>
-        <% if gift_card.redeemed? %>
-          <td class="align-center"><%= link_to "#{gift_card.redeemer.email}", edit_admin_user_path(gift_card.redeemer) %></td>
-          <td class="align-center"><%= gift_card.redeemed_at.localtime.strftime("%F %I:%M%p") %></td>
-        <% else %>
-          <td class="align-center"></td>
-          <td class="align-center"></td>
-        <% end %>
-      </tr>
-    <% end %>
-  </tbody>
-</table>

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

@@ -0,0 +1,3 @@
+<% item.gift_cards.each do |gift_card| %>
+  <%= render partial: "gift_card_details", locals: { gift_card: gift_card } %>
+<% end %>

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

@@ -0,0 +1,50 @@
+<fieldset class="no-border-bottom">
+  <legend align="center" data-hook="gift-card">
+    <%= Spree.t(:gift_cards_details) %>
+  </legend>
+</fieldset>
+
+<table>
+  <colgroup>
+    <col style="width: 15%;" />
+    <col style="width: 15%;" />
+    <col style="width: 15%;" />
+    <col style="width: 30%;" />
+    <col style="width: 10%;" />
+    <col style="width: 15%;" />
+  </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>
+  </thead>
+  
+
+  <tbody>
+    <% @order.line_items.flat_map(&:gift_cards).each do |gift_card| %>
+      <tr>
+        <td>
+          <%= gift_card.recipient_email || "n/a" %>
+        </td>
+        <td>
+          <%= gift_card.recipient_name || "n/a" %>
+        </td>
+        <td>
+          <%= gift_card.purchaser_name || "n/a" %>
+        </td>
+        <td>
+          <%= gift_card.gift_message || "n/a" %>
+        </td>
+        <td>
+          <%= 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') %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,2 @@
+<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' %>

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

@@ -0,0 +1,3 @@
+<% item.line_item.gift_cards.each do |gift_card| %>
+  <%= render partial: "gift_card_details", locals: { gift_card: gift_card } %>
+<% end %>

data/bin/rails

@@ -1,7 +1,7 @@
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/spree_store_credits/engine', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/spree_virtual_gift_card/engine', __FILE__)
 
 require 'rails/all'
 require 'rails/engine/commands'

data/config/initializers/line_item_controller_gift_card_details.rb

@@ -0,0 +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::Order.line_item_comparison_hooks.add('gift_card_match')
+end

data/config/initializers/ransack.rb

@@ -0,0 +1,7 @@
+Ransack.configure do |config|
+  config.add_predicate 'is',
+  arel_predicate: 'eq',
+  formatter: proc { |v| v.to_date },
+  validator: proc { |v| v.present? },
+  type: :string
+end

data/config/locales/en.yml

@@ -3,8 +3,11 @@ en:
   spree:
     admin:
       gift_cards:
+        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!"
         redeem: "Redeem"
         redeem_gift_card: "Redeem Gift Card"
         redeemed_gift_card: "Redeemed Gift Card"

data/config/routes.rb

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

data/db/migrate/20151013172931_add_recipient_fields_to_virtual_gift_card.rb

@@ -0,0 +1,8 @@
+class AddRecipientFieldsToVirtualGiftCard < ActiveRecord::Migration
+  def change
+    add_column :spree_virtual_gift_cards, :recipient_name, :string
+    add_column :spree_virtual_gift_cards, :recipient_email, :string
+    add_column :spree_virtual_gift_cards, :gift_message, :text
+    add_column :spree_virtual_gift_cards, :purchaser_name, :string
+  end
+end

data/db/migrate/20151013210615_add_active_flag_to_virtual_gift_card.rb

@@ -0,0 +1,5 @@
+class AddActiveFlagToVirtualGiftCard < ActiveRecord::Migration
+  def change
+    add_column :spree_virtual_gift_cards, :redeemable, :boolean, default: false
+  end
+end

data/db/migrate/20151013214647_set_redeemable_true_on_virtual_gift_cards.rb

@@ -0,0 +1,11 @@
+class SetRedeemableTrueOnVirtualGiftCards < ActiveRecord::Migration
+  def up
+    Spree::VirtualGiftCard.find_each do |gift_card|
+      gift_card.update_attributes!(redeemable: true)
+    end
+  end
+
+  def down
+    #noop
+  end
+end

data/db/migrate/20151019190731_add_email_send_time_to_virtual_gift_card.rb

@@ -0,0 +1,7 @@
+class AddEmailSendTimeToVirtualGiftCard < ActiveRecord::Migration
+  def change
+    add_column :spree_virtual_gift_cards, :send_email_at, :date
+    add_column :spree_virtual_gift_cards, :sent_at, :datetime
+    add_index :spree_virtual_gift_cards, :send_email_at
+  end
+end

data/lib/spree_virtual_gift_card/factories.rb

@@ -4,10 +4,19 @@ FactoryGirl.define do
   end
 
   factory :virtual_gift_card, class: Spree::VirtualGiftCard do
-    association :purchaser, factory: :user
     association :line_item, factory: :line_item
-
     amount 25.0
     currency "USD"
+    recipient_name "Tom Riddle"
+    recipient_email "me@lordvoldemort.com"
+
+    factory :redeemable_virtual_gift_card do
+      association :purchaser, factory: :user
+      redeemable true
+
+      before(:create) do |gift_card, evaluator|
+        gift_card.redemption_code = gift_card.send(:generate_unique_redemption_code)
+      end
+    end
   end
 end

data/lib/tasks/send_gift_card_emails.rake

@@ -0,0 +1,8 @@
+namespace :solidus_virtual_gift_card do
+  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
+    end
+  end
+end

data/solidus_virtual_gift_card.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = "solidus_virtual_gift_card"
-  s.version     = "1.0.0"
+  s.version     = "1.0.1"
   s.summary     = "Virtual gift card for purchase, drops into the user's account as store credit"
   s.required_ruby_version = ">= 2.1"
 

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

@@ -14,38 +14,6 @@ describe Spree::Admin::GiftCardsController do
     end
   end
 
-  describe 'GET show' do
-    let(:gift_card) { create(:virtual_gift_card) }
-    let(:redemption_code) { gift_card.redemption_code }
-
-    subject { spree_get :show, id: redemption_code }
-
-    context 'with a valid redemption code' do
-      it 'loads the gift cards' do
-        subject
-        expect(assigns(:gift_cards)).to eq [gift_card]
-      end
-
-      it 'returns a 200 status code' do
-        subject
-        expect(response.code).to eq '200'
-      end
-    end
-
-    context 'with an invalid redemption code' do
-      let(:redemption_code) { "DOES-NOT-EXIST" }
-
-      it "redirects to index" do
-        expect(subject).to redirect_to spree.admin_gift_cards_path
-      end
-
-      it "sets the flash error" do
-        subject
-        expect(flash[:error]).to eq Spree.t('admin.gift_cards.errors.not_found')
-      end
-    end
-  end
-
   describe 'GET lookup' do
     let(:user) { create :user }
     subject { spree_get :lookup, user_id: user.id }
@@ -58,7 +26,7 @@ describe Spree::Admin::GiftCardsController do
 
   describe 'POST redeem' do
     let(:user) { create :user }
-    let(:gift_card) { create(:virtual_gift_card) }
+    let(:gift_card) { create(:redeemable_virtual_gift_card) }
     let(:redemption_code) { gift_card.redemption_code }
 
     subject { spree_post :redeem, user_id: user.id, gift_card: { redemption_code: redemption_code } }

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

@@ -6,7 +6,7 @@ describe Spree::Api::GiftCardsController do
   let!(:gc_category) { create(:store_credit_gift_card_category) }
 
   describe "POST redeem" do
-    let(:gift_card) { create(:virtual_gift_card) }
+    let(:gift_card) { create(:redeemable_virtual_gift_card) }
 
     let(:parameters) do
       {

data/spec/features/admin/gift_cards_spec.rb

@@ -0,0 +1,74 @@
+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 gift card" do
+    let(:gift_card) { create(:redeemable_virtual_gift_card) }
+    let(:order) { gift_card.line_item.order }
+    let(:new_recipient_name) { "Heidi" }
+    let(:new_recipient_email) { "heidi@gmail.com" }
+    let(:new_purchaser_name) { "Neerali" }
+    let(:new_gift_message) { "Sweaters!" }
+
+    it "can edit recipient information and send email date" do
+      visit spree.cart_admin_order_path(order)
+
+      within ".line-item-name" do
+        click_link("Edit Details")
+      end
+
+      fill_in "virtual_gift_card_recipient_name", with: new_recipient_name
+      fill_in "virtual_gift_card_recipient_email", with: new_recipient_email
+      fill_in "virtual_gift_card_purchaser_name", with: new_purchaser_name
+      fill_in "virtual_gift_card_gift_message", with: new_gift_message
+      fill_in "virtual_gift_card_send_email_at", with: Date.tomorrow
+
+      # Just so the datepicker gets out of poltergeists way.
+      page.execute_script("$('#virtual_gift_card_send_email_at').datepicker('widget').hide();")
+
+      click_on 'Update'
+      expect(page).to have_content("Gift card updated!")
+      expect(gift_card.reload.recipient_name).to eq(new_recipient_name)
+      expect(gift_card.recipient_email).to eq(new_recipient_email)
+      expect(gift_card.purchaser_name).to eq(new_purchaser_name)
+      expect(gift_card.gift_message).to eq(new_gift_message)
+    end
+  end
+
+  describe "lookup a gift card" do
+    let(:gift_card) { create(:redeemable_virtual_gift_card,
+                             recipient_name: "Daeva",
+                             recipient_email: 'dog@example.com',
+                            )
+    }
+    let(:other_gift_card) { create(:redeemable_virtual_gift_card)}
+    let(:order) { gift_card.line_item.order }
+
+    it "can lookup gift card by recipient email" do
+      visit spree.admin_gift_cards_path
+
+      fill_in "q[recipient_email_cont]", with: gift_card.recipient_email
+      click_on "Lookup Gift Card"
+
+      expect(page).to have_content(gift_card.purchaser.email)
+      expect(page).to_not have_content(other_gift_card.purchaser.email)
+    end
+
+    it "can lookup gift card by order number" do
+      visit spree.admin_gift_cards_path
+
+      fill_in "q[line_item_order_number_cont]", with: order.number
+      click_on "Lookup Gift Card"
+
+      expect(page).to have_content(gift_card.purchaser.email)
+      expect(page).to_not have_content(other_gift_card.purchaser.email)
+    end
+  end
+end