piggybak 0.6.30 → 0.6.31

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    piggybak (0.6.30)
+    piggybak (0.6.31)
       activemerchant
       countries
       devise

data/app/assets/javascripts/piggybak/piggybak.js

@@ -12,18 +12,21 @@ $(function() {
 	piggybak.update_tax();
 	$('#new_piggybak_order').validate({
 		submitHandler: function(form) {
+      var submit = $($('#new_piggybak_order input[type=submit]'));
+      submit.prop('disabled',true);
+      submit.attr('value','Processing...');
 			form.submit()
 		}
 	});
 });
 
 var piggybak = {
-	shipping_els: $('#piggybak_order_shipping_address_attributes_state_id,#piggybak_order_shipping_address_attributes_country_id,#piggybak_order_shipping_address_attributes_zip'),
+	shipping_els: '#piggybak_order_shipping_address_attributes_state_id,#piggybak_order_shipping_address_attributes_country_id,#piggybak_order_shipping_address_attributes_zip',
 	initialize_listeners: function() {
-		piggybak.shipping_els.on('change', function() {
+		$(document).on('change', piggybak.shipping_els, function() {
 			piggybak.update_shipping_options($(this));
 		});
-		$('#piggybak_order_billing_address_attributes_state_id').on('change', function() {
+		$(document).on('change', '#piggybak_order_billing_address_attributes_state_id', function() {
 			piggybak.update_tax();
 		});
 		$('#shipping select').change(function() {

data/app/controllers/piggybak/orders_controller.rb

@@ -92,7 +92,7 @@ module Piggybak
     end
 
     def email
-      order = Order.find(params[:id])
+      order = Piggybak::Order.find(params[:id])
 
       if can?(:email, order)
         Piggybak::Notifier.order_notification(order).deliver
@@ -104,7 +104,7 @@ module Piggybak
     end
 
     def cancel
-      order = Order.find(params[:id])
+      order = Piggybak::Order.find(params[:id])
 
       if can?(:cancel, order)
         order.recorded_changer = current_user.id

data/app/models/piggybak/order.rb

@@ -21,7 +21,7 @@ module Piggybak
     validate :number_payments
     before_save :postprocess_order, :update_status, :set_new_record
     after_save :record_order_note
-    after_save :deliver_order_confirmation, :if => Proc.new { |order| order.ip_address != "admin" }
+    after_save :deliver_order_confirmation, :if => Proc.new { |order| !order.confirmation_sent }
 
     default_scope :order => 'created_at DESC'
 
@@ -30,7 +30,9 @@ module Piggybak
                     :order_notes_attributes, :details, :recorded_changer, :ip_address
                    
     def deliver_order_confirmation
+Rails.logger.warn "stephie inside deliver order confirmation"
       Piggybak::Notifier.order_notification(self).deliver
+      self.update_column(:confirmation_sent,true)
     end
  
     def initialize_defaults

data/app/views/piggybak/cart/_items.html.erb

@@ -16,7 +16,7 @@
 		<td><%= number_to_currency item[:sellable].price %></td>
 		<td>
 			<% if page == "cart" -%>
-			<%= text_field_tag "quantity[#{item[:sellable].id}]", item[:quantity] %>
+			<%= number_field_tag "quantity[#{item[:sellable].id}]", item[:quantity] %>
             <% else -%>
 			<%= item[:quantity] %>
 			<% end -%>
@@ -66,7 +66,9 @@
 </table>
 
 <% if page == "cart" %>
-<%= link_to "Proceed to Checkout", piggybak.orders_url, :id => "checkout" %>
+<div data-no-turbolink>
+	<%= link_to "Proceed to Checkout", piggybak.orders_url, :id => "checkout" %>
+</div>
 <%= submit_tag "Update", :id => "update" %>
 <% end -%>
 

data/app/views/piggybak/orders/_billing_address.html.erb

@@ -1,4 +1,4 @@
-<div id="billing_address">
+<div id="billing_address" data-no-turbolink>
 	<h3>Billing Address</h3>
 	<%= f.fields_for :billing_address do |billing_address| %>
 	<%= render "address_form", :address => billing_address, :type => "billing" %>

data/app/views/piggybak/orders/_shipping.html.erb

@@ -1,4 +1,4 @@
-<div id="shipping">
+<div id="shipping" data-no-turbolink>
 	<h3>Shipping Option</h3>
 	<%= f.fields_for :line_items, @order.line_items.detect { |li| li.line_item_type == "shipment" } do |line_item_f| %>
 		<%= line_item_f.hidden_field :line_item_type, { :value => "shipment" } %>

data/app/views/piggybak/orders/_shipping_address.html.erb

@@ -1,4 +1,4 @@
-<div id="shipping_address">
+<div id="shipping_address" data-no-turbolink>
 	<h3>
 		Shipping Address
 		<a href="#" id="copy">copy from billing</a>

data/app/views/rails_admin/main/_order_details.html.erb

@@ -25,7 +25,7 @@ N/A
 		<td valign="top">Actions</td>
 		<td>
 			<ul>
-				<li><%= link_to "Send or Resend Email Confirmation", piggybak.email_order_url(form.object.id) %></li>
+				<li><%= link_to "Resend Email Confirmation", piggybak.email_order_url(form.object.id) %></li>
 				<li><%= link_to "View as Text", piggybak.download_order_url(form.object.id) %></li>
 				<% if form.object.total_due == 0.00 -%>
 				<li><%= link_to "Cancel Order", piggybak.cancel_order_url(form.object.id) %> (This does not refund payments.)</li>

data/db/migrate/20130516200305_add_confirmation_sent_to_orders.rb

@@ -0,0 +1,5 @@
+class AddConfirmationSentToOrders < ActiveRecord::Migration
+  def change
+    add_column :orders, :confirmation_sent, :boolean, :default => false
+  end
+end

data/lib/piggybak.rb

@@ -291,7 +291,7 @@ module Piggybak
           edit do
             field :copy_from_billing do
               visible do
-                bindings[:object].is_shipping
+                bindings[:object].respond_to?(:is_shipping) && bindings[:object].is_shipping
               end 
               partial "copy_from_billing"
               label "Help"

data/lib/piggybak/version.rb

@@ -1,3 +1,3 @@
 module Piggybak
-  VERSION = "0.6.30"
+  VERSION = "0.6.31"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.6.30
+  version: 0.6.31
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,6 +191,7 @@ files:
 - db/migrate/20111228231806_create_payment_methods.rb
 - db/migrate/20121018213421_drop_sort_from_line_items.rb
 - db/migrate/20121022164235_convert_all_decimal_fields.rb
+- db/migrate/20130516200305_add_confirmation_sent_to_orders.rb
 - db/migrate/20121210211600_change_user_agent_type.rb
 - db/migrate/20111228231838_create_shipments.rb
 - db/migrate/20120104020930_populate_countries_and_states.rb
@@ -235,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3262820851229346981
+      hash: -2815695535894919528
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -244,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3262820851229346981
+      hash: -2815695535894919528
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23