spree_recurring_order 2.1.3 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e31aea92275d38f02697dafbbe7af85671fff65
-  data.tar.gz: d67a7308522c80729b4c602a092bd1ceac06c944
+  metadata.gz: 76ffe7a472fefe7657097737d7ff66b0926226de
+  data.tar.gz: 23934df33f63bada758d01918898ed47d7ded4dc
 SHA512:
-  metadata.gz: 522d03015e276c9a0bb0eefb1db427cfb70f49a49b1ba8f81b51c13ce35ab02cef3acc5429ca4b4c8a8ad57815d0e3c7a65eebe7ab5eb3592c87a11bc111b111
-  data.tar.gz: f7a4b1c93340f1d010e981c6a7fefaf95299853e976c7b95e6e71a7c192b60a90ad9026c786fc96ba055279bf6f1b5fdd90b53e3f95656609a9cbc32aefb103c
+  metadata.gz: 002bc796fb66c3b4ffae936406329c5de2fd5a7c2cf89ce92ac74ad254576cded12d3c8145c75ba7ddd2a42603eacb5696d0fab87282e70ab609bdb2dac24266
+  data.tar.gz: 23c27260548c84e148cd9b9142e3cb94205fae67e0d49f389547459a92b1e654ad64a2a7ee492f8f91d12cd65ea31c837fe3846af68e768dae58f6e42c0cabd7

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

@@ -6,6 +6,10 @@ module Spree
         @recurring_orders = Spree::RecurringOrder.all
       end
 
+      def show
+        @recurring_order = Spree::RecurringOrder.find_by(number: params[:number])
+      end
+
     end
   end
 end

data/app/controllers/spree/orders_controller_decorator.rb

@@ -5,6 +5,12 @@ Spree::OrdersController.class_eval do
 
     @order = Spree::Order.find_by_number!(params[:id])
     @recurring_order = Spree::RecurringOrder.new
+
+    if @present_recurring
+      render :show_recurring
+    else
+      render :show
+    end
   end
 
 end

data/app/controllers/spree/recurring_orders_controller.rb

@@ -10,7 +10,8 @@ module Spree
         if @recurring_order.save
           redirect_to(spree.recurring_order_url(@recurring_order.id))
         else
-          render :new
+          flash[:notice] = "Hmmm... There was a problem creating your recurring order. Please get in touch at hello@yourgrocer.com.au and we are going to sort it out for you."
+          redirect_to(order_url(original_order.number))
         end
       else
         flash[:notice] = "Hmmm... It seems like this order already has a recurring order associated with it. Please get in touch at hello@yourgrocer.com.au if you have any doubts about it"

data/app/models/spree/recurring_order.rb

@@ -7,6 +7,8 @@ module Spree
 
     belongs_to :original_order, class_name: 'Spree::Order'
 
+    after_create :generate_order_number
+
     def self.create_from_order(order)
       recurring_order = RecurringOrder.new
       recurring_order.orders << order
@@ -32,5 +34,16 @@ module Spree
       self.errors[:orders] << "cannot be empty" if orders.empty?
     end
 
+    def generate_order_number
+      record = true
+      while record
+        random = "R#{Array.new(6){rand(6)}.join}"
+        record = self.class.where(number: random).first
+      end
+      self.number = random if self.number.blank?
+      self.number
+      self.save!
+    end
+
   end
 end

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

@@ -13,20 +13,24 @@
     </colgroup>
     <thead>
       <tr>
+        <th><%= Spree.t(:recurring_order_number, resource: I18n.t(:other, :scope => 'activerecord.attributes.spree/recurring_order')) %></th>
         <th><%= Spree.t(:original_order_number, resource: I18n.t(:other, :scope => 'activerecord.attributes.spree/recurring_order')) %></th>
         <th><%= Spree.t(:customer_email, resource: I18n.t(:other, :scope => 'activerecord.attributes.spree/recurring_order')) %></th>
         <th><%= Spree.t(:customer_phone, resource: I18n.t(:other, :scope => 'activerecord.attributes.spree/recurring_order')) %></th>
         <th><%= Spree.t(:active?, resource: I18n.t(:other, :scope => 'activerecord.attributes.spree/recurring_order')) %></th>
+        <th><%= Spree.t(:number_of_orders, resource: I18n.t(:other, :scope => 'activerecord.attributes.spree/recurring_order')) %></th>
         <th><%= Spree.t(:created_at, resource: I18n.t(:created_at, :scope => 'activerecord.attributes.spree/recurring_order')) %></th>
       </tr>
     </thead>
     <tbody>
       <% @recurring_orders.each do |order| %>
         <tr class="<%= cycle('odd', 'even') %>">
+          <td class="align-center"><%= link_to order.number, admin_recurring_order_path(order.number) %></td>
           <td class="align-center"><%= link_to order.original_order.number, edit_admin_order_path(order.original_order) %></td>
           <td class="align-center"><%= mail_to order.email %></td>
           <td class="align-center"><%= mail_to order.phone %></td>
           <td class="align-center">YES</td>
+          <td class="align-center"><%= order.orders.count %></td>
           <td class="align-center"><%= l (order.created_at).to_date %></td>
         </tr>
       <% end %>

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

@@ -0,0 +1,42 @@
+<% content_for :page_title do %>
+  <%= "Recurring Order #{@recurring_order.number}" %>
+<% end %>
+
+<% content_for :sidebar_title do %>
+  <%= Spree.t(:recurring_information) %>
+<% end %>
+
+<% content_for :sidebar do %>
+  <header id="order_tab_summary" data-hook>
+    <dl class="additional-info">
+      <dt id="order_email" data-hook><%= Spree.t(:email) %>:</dt>
+      <dd><%= @recurring_order.email %></dd>
+      <dt id="order_phone" data-hook><%= Spree.t(:phone) %>:</dt>
+      <dd><%= @recurring_order.phone %></dd>
+      <dt id="order_original_order" data-hook><%= Spree.t(:original) %>:</dt>
+      <dd><%= @recurring_order.original_order.number %></dd>
+      <dt id="order_created_at" data-hook><%= Spree.t(:created_date) %>:</dt>
+      <dd><%= l (@recurring_order.created_at).to_date %></dd>
+    </dl>
+  </header>
+<% end %>
+
+<fieldset class='no-border-bottom'>
+  <legend>Orders</legend>
+  <table>
+    <thead>
+      <th><%= Spree.t('number')%></th> 
+      <th><%= Spree.t('created_date')%></th>
+      <th><%= Spree.t('delivery_date')%></th>
+    </thead>
+    <tbody class="with-border">
+      <% @recurring_order.orders.each do |order| %>
+        <tr>
+          <td class="align-center"><strong><%= link_to order.number, edit_admin_order_path(order) %></strong></td>
+          <td class="align-center"><span><%= l (order.created_at).to_date %></span></td>
+          <td class="align-center"><span><%= l (order.delivery_date).to_date %></span></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</fieldset>

data/app/views/spree/orders/show_recurring.html.erb

@@ -0,0 +1 @@
+You have to implement this view

data/app/views/spree/recurring_orders/show.html.erb

@@ -1,14 +1 @@
-<div id='show_recurring_order'>
-  <h1 class='title'>And that's all!</h1>
-
-  <h2 class='text'>
-    <%= "Grocery shopping just became much easier for you, #{@recurring_order.original_order.ship_address.firstname}." %>
-  </h2>
-
-
-  <h2 class='text'>
-    We are getting in touch to setup your recurring order, 
-    so feel free to relax and think about all that time that you are going to have in your hands.
-  </h2>
-
-</div>
+You need to implement this view

data/config/routes.rb

@@ -4,4 +4,5 @@ Spree::Core::Engine.routes.draw do
   get "/recurring_orders/:id", controller: 'recurring_orders', action: 'show', as: 'recurring_order'
 
   get "admin/recurring_orders/", controller: 'admin/recurring_orders', action: 'index', as: 'admin_recurring_orders'
+  get "admin/recurring_orders/:number", controller: 'admin/recurring_orders', action: 'show', as: 'admin_recurring_order'
 end

data/db/migrate/20140211055527_add_number_to_recurring_order.rb

@@ -0,0 +1,7 @@
+class AddNumberToRecurringOrder < ActiveRecord::Migration
+
+  def change
+    add_column :spree_recurring_orders, :number, :string
+  end
+
+end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::Admin::RecurringOrdersController do
-  
+
   let(:user) { mock_model Spree::User, :last_incomplete_spree_order => nil, :has_spree_role? => true, :spree_api_key => 'fake' }
 
   before :each do
@@ -21,4 +21,16 @@ describe Spree::Admin::RecurringOrdersController do
 
   end
 
+  describe 'show' do
+
+    it 'should assign recurring order' do
+      recurring_order = double(Spree::RecurringOrder)
+      Spree::RecurringOrder.should_receive(:find_by).with(number: 'R1234').and_return(recurring_order)
+
+      spree_get :show, number: 'R1234'
+      assigns(:recurring_order).should == recurring_order
+    end
+
+  end
+
 end

data/spec/controllers/spree/orders_controller_spec.rb

@@ -29,14 +29,16 @@ describe Spree::OrdersController do
       assigns(:recurring_order).should == recurring_order
     end
 
-    it 'should assign @present_recurring' do
+    it 'should render show_recurring if order completed is true' do
       spree_get :show, {id: "G2134", order_completed: true}
       assigns(:present_recurring).should == true 
+      response.should render_template('show_recurring')
     end
 
-    it 'should not assign @present_recurring if not present' do
+    it 'should render show normally' do
       spree_get :show, {id: "G2134"}
       assigns(:present_recurring).should == false
+      response.should render_template('show')
     end
 
   end

data/spec/controllers/spree/recurring_order_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Spree::RecurringOrdersController do
-  
+
   let(:original_order){ FactoryGirl.build(:order, id: 1, number: 'G1234') }
   let(:orders){ [] }
   let(:recurring_order){ double(Spree::RecurringOrder, save: true, id: 666, orders: orders).as_null_object }
@@ -42,7 +42,7 @@ describe Spree::RecurringOrdersController do
       recurring_order.should_receive(:save).and_return(false)
 
       spree_post :create, recurring_order: {original_order_id: 1}
-      response.should render_template(:new) 
+      response.should redirect_to("/orders/G1234")
     end
 
     it 'should render order complete if recurring order already exists' do

data/spec/models/spree/recurring_order_spec.rb

@@ -18,8 +18,23 @@ describe Spree::RecurringOrder do
       recurring_order.original_order.should == order
     end
 
+    it "should assign number that starts with R" do
+      order = FactoryGirl.create(:order)
+
+      recurring_order = Spree::RecurringOrder.create_from_order(order)
+      recurring_order.number.should =~ /^R/
+    end
+
+    it "should assign number that has 6 numbers" do
+      order = FactoryGirl.create(:order)
+
+      recurring_order = Spree::RecurringOrder.create_from_order(order)
+      recurring_order.number.should =~ /\d{6}$/
+    end
+
   end
 
+
   describe 'validation' do
 
     it 'should have at least one order' do

data/spree_recurring_order.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_recurring_order'
-  s.version     = '2.1.3'
+  s.version     = '2.1.5'
   s.summary     = 'Add the option to create a recurring order'
   s.description = ''
   s.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_recurring_order
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.5
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -180,25 +180,23 @@ files:
 - app/assets/javascripts/store/spree_recurring_order.js
 - app/assets/stylesheets/admin/admin.scss
 - app/assets/stylesheets/admin/spree_recurring_order.css
-- app/assets/stylesheets/store/order_complete.css
-- app/assets/stylesheets/store/show_order.css
 - app/assets/stylesheets/store/spree_recurring_order.css
 - app/controllers/spree/admin/recurring_orders_controller.rb
 - app/controllers/spree/orders_controller_decorator.rb
 - app/controllers/spree/recurring_orders_controller.rb
 - app/models/spree/order_decorator.rb
 - app/models/spree/recurring_order.rb
-- app/overrides/add_recurring_order_form.rb
 - app/overrides/add_tab_to_admin_menu.rb
 - app/views/spree/admin/recurring_orders/index.html.erb
+- app/views/spree/admin/recurring_orders/show.html.erb
 - app/views/spree/admin/shared/_recurring_orders_tab.html.erb
-- app/views/spree/orders/_recurring_order_form.html.erb
-- app/views/spree/recurring_orders/new.html.erb
+- app/views/spree/orders/show_recurring.html.erb
 - app/views/spree/recurring_orders/show.html.erb
 - bin/rails
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20140204052508_create_recurring_orders_table.rb
+- db/migrate/20140211055527_add_number_to_recurring_order.rb
 - lib/generators/spree_recurring_order/install/install_generator.rb
 - lib/spree_recurring_order.rb
 - lib/spree_recurring_order/engine.rb

data/app/assets/stylesheets/store/order_complete.css

@@ -1,8 +0,0 @@
-fieldset#recurring_orders {
-  text-align: center;
-}
-
-fieldset#recurring_orders input[type='submit'] {
-  font-size: 24px;
-  text-align: center;
-}

data/app/assets/stylesheets/store/show_order.css

@@ -1,14 +0,0 @@
-div#show_recurring_order {
-  text-align: center;
-  margin-left: 10%;
-  margin-right: 10%;
-}
-
-div#show_recurring_order .title, div#show_recurring_order .text {
-  margin-top: 30px;;
-}
-
-div#show_recurring_order fieldset.share {
-  margin-top: 60px;
-}
-

data/app/overrides/add_recurring_order_form.rb

@@ -1,5 +0,0 @@
-Deface::Override.new(:virtual_path => "spree/orders/show",
-                     :name => "add_recurring_order_form",
-                     :insert_before => "#order_summary",
-                     :partial => "spree/orders/recurring_order_form",
-                     :disabled => false)

data/app/views/spree/orders/_recurring_order_form.html.erb

@@ -1,16 +0,0 @@
-<%- if @present_recurring %>
-  <fieldset id='recurring_orders'>
-
-    <h2>
-      <%= "Thanks #{@order.ship_address.firstname}!" %>
-    </h2>
-    <h2>Would you like to make this process even easier next time?</h2>
-    <p>Sign up for a recurring order and we will get in touch so you don't have to worry about your groceries anymore.</p>
-
-    <%= form_for @recurring_order do |f| %>
-      <%= f.hidden_field :original_order_id, value: @order.id %>
-      <%= f.submit "Send me hassle-free groceries" %>
-    <% end %>
-
-  </fieldset>
-<% end %>

data/app/views/spree/recurring_orders/new.html.erb

@@ -1,6 +0,0 @@
-<h1>And that's all!</h1>
-
-<h2>
-  We are getting in touch with you to setup your recurring order, 
-  so feel free to relax and think about all that time you are going to have in your hands
-</h2>