piggybak 0.4.5 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/app/models/piggybak/order.rb

@@ -128,22 +128,22 @@ module Piggybak
       return if self.status == "cancelled"  # do nothing
 
       if self.total_due > 0.00
-        self.status = "payment owed"
+        self.status = "payment_owed"
       elsif self.total_due < 0.00
         self.status = "credit_owed" 
       else
-        if self.total == 0.00
-          self.status = "new"
-        elsif self.shipments.any? && self.shipments.all? { |s| s.status == "shipped" }
+        if self.shipments.any? && self.shipments.all? { |s| s.status == "shipped" }
           self.status = "shipped"
+        elsif self.shipments.any? && self.shipments.all? { |s| s.status == "processing" }
+          self.status = "processing"
         else
-          self.status = "paid"
+          self.status = "new"
         end
       end
     end
 
     def status_enum
-      ["incomplete", "paid", "shipped"]
+      ["new", "processing", "shipped"]
     end
       
     def avs_address

data/app/models/piggybak/payment.rb

@@ -83,9 +83,6 @@ module Piggybak
     def admin_label
       if !self.new_record? 
         return "Payment ##{self.id} (#{self.created_at.strftime("%m-%d-%Y")})<br />" + 
-          "Payment Method: #{self.payment_method.description}<br />" +
-          "Status: #{self.status}<br />" +
-          "Transaction ID: #{self.transaction_id}<br />" + 
           "$#{"%.2f" % self.total}"
       else
         return ""

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

@@ -34,9 +34,9 @@ N/A
 		<td>Actions</td>
 		<td>
 			<ul>
-				<li><%= link_to "Send Email Confirmation", piggybak.email_order_url(form.object.id) %></li>
+				<li><%= link_to "Send or 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>
-				<li><%= link_to "Cancel Order", piggybak.cancel_order_url(form.object.id) %> (marks payments as refunded, marks order as cancelled)</li>
+				<li><%= link_to "Cancel Order", piggybak.cancel_order_url(form.object.id) %> (This does not mark the payment gateway payments. This marks payments tied to ths order in this database as refunded, and marks the order as cancelled.)</li>
 			</ul>
 		</td>
 	</tr>

data/lib/piggybak.rb

@@ -99,7 +99,7 @@ module Piggybak
             field :line_items
             field :shipments
             field :payments do
-              partial "form_nested_no_destroy"
+              active true
             end
           end
         end
@@ -175,8 +175,15 @@ module Piggybak
               end 
             end
             field :number do
-              read_only do 
-                !bindings[:object].new_record?
+              help "Required"
+              visible do
+                bindings[:object].new_record?
+              end 
+            end
+            field :verification_value do
+              help "Required"
+              visible do
+                bindings[:object].new_record?
               end 
             end
             field :month do
@@ -191,11 +198,6 @@ module Piggybak
                 !bindings[:object].new_record?
               end 
             end
-            field :verification_value do
-              read_only do 
-                !bindings[:object].new_record?
-              end 
-            end
             field :total do
               read_only true
               formatted_value do
@@ -204,8 +206,11 @@ module Piggybak
               help "This will automatically be calculated at the time of processing."
             end
             field :actions do
+              visible do
+                !bindings[:object].new_record?
+              end 
               partial "payment_refund"
-              help "Admin driven refunds are not supported because credit cards are not stored."
+              help "This does not mark the payment gateway payment as refunded. This only marks this local payment as refunded."
             end
           end
         end

data/piggybak.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steph Skardal", "Brian Buchalter"]
-  s.date = "2012-07-02"
+  s.date = "2012-07-10"
   s.description = "Mountable ecommerce"
   s.email = "steph@endpoint.com"
   s.extra_rdoc_files = [
@@ -65,7 +65,6 @@ Gem::Specification.new do |s|
     "app/views/piggybak/orders/no_access.text.erb",
     "app/views/piggybak/orders/receipt.html.erb",
     "app/views/piggybak/orders/submit.html.erb",
-    "app/views/rails_admin/main/_form_nested_no_destroy.html.haml",
     "app/views/rails_admin/main/_location_select.html.haml",
     "app/views/rails_admin/main/_no_edit_form_filtering_select.html.haml",
     "app/views/rails_admin/main/_order_details.html.erb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-02 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &15950040 !ruby/object:Gem::Requirement
+  requirement: &18516240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15950040
+  version_requirements: *18516240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15949500 !ruby/object:Gem::Requirement
+  requirement: &18531600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *15949500
+  version_requirements: *18531600
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &15948700 !ruby/object:Gem::Requirement
+  requirement: &18528980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *15948700
+  version_requirements: *18528980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15962920 !ruby/object:Gem::Requirement
+  requirement: &18528100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15962920
+  version_requirements: *18528100
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &15960720 !ruby/object:Gem::Requirement
+  requirement: &18526400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *15960720
+  version_requirements: *18526400
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &15958880 !ruby/object:Gem::Requirement
+  requirement: &18524560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15958880
+  version_requirements: *18524560
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &15956660 !ruby/object:Gem::Requirement
+  requirement: &18539260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15956660
+  version_requirements: *18539260
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &15971060 !ruby/object:Gem::Requirement
+  requirement: &18537580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15971060
+  version_requirements: *18537580
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &15970280 !ruby/object:Gem::Requirement
+  requirement: &18535840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15970280
+  version_requirements: *18535840
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  requirement: &15969800 !ruby/object:Gem::Requirement
+  requirement: &18535300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15969800
+  version_requirements: *18535300
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &15969260 !ruby/object:Gem::Requirement
+  requirement: &18533940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15969260
+  version_requirements: *18533940
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &15967740 !ruby/object:Gem::Requirement
+  requirement: &18532340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15967740
+  version_requirements: *18532340
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &15967100 !ruby/object:Gem::Requirement
+  requirement: &18547780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15967100
+  version_requirements: *18547780
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &15966160 !ruby/object:Gem::Requirement
+  requirement: &18546980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15966160
+  version_requirements: *18546980
 - !ruby/object:Gem::Dependency
   name: countries
-  requirement: &15965420 !ruby/object:Gem::Requirement
+  requirement: &18546240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,10 +176,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15965420
+  version_requirements: *18546240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15964900 !ruby/object:Gem::Requirement
+  requirement: &18545380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -187,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15964900
+  version_requirements: *18545380
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &15964120 !ruby/object:Gem::Requirement
+  requirement: &18544560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -198,10 +198,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15964120
+  version_requirements: *18544560
 - !ruby/object:Gem::Dependency
   name: diff-lcs
-  requirement: &15979560 !ruby/object:Gem::Requirement
+  requirement: &18543980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -209,10 +209,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15979560
+  version_requirements: *18543980
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &15978580 !ruby/object:Gem::Requirement
+  requirement: &18543320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -220,10 +220,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15978580
+  version_requirements: *18543320
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &15977580 !ruby/object:Gem::Requirement
+  requirement: &18542760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -231,7 +231,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15977580
+  version_requirements: *18542760
 description: Mountable ecommerce
 email: steph@endpoint.com
 executables: []
@@ -288,7 +288,6 @@ files:
 - app/views/piggybak/orders/no_access.text.erb
 - app/views/piggybak/orders/receipt.html.erb
 - app/views/piggybak/orders/submit.html.erb
-- app/views/rails_admin/main/_form_nested_no_destroy.html.haml
 - app/views/rails_admin/main/_location_select.html.haml
 - app/views/rails_admin/main/_no_edit_form_filtering_select.html.haml
 - app/views/rails_admin/main/_order_details.html.erb
@@ -391,7 +390,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2316856240211124615
+      hash: -1493470679873479469
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/views/rails_admin/main/_form_nested_no_destroy.html.haml

@@ -1,15 +0,0 @@
-= form.fields_for field.name do |nested_form|
-  %blockquote
-    - if nested_form.object.new_record?
-      = nested_form.link_to_remove "cancel", :class => 'label notice', :id => "payments_cancel"
-    = nested_form.generate({:action => :create, :model_config => field.associated_model_config, :nested_in => field.name })
-    %hr
-= form.link_to_add t("admin.index.add_new"), field.name, :class => 'label notice', :id => "payments_add"
-
-:javascript
-    $('#payments_add').live('click', function() {
-      $(this).hide();
-    });
-    $('#payments_cancel').live('click', function() {
-      $('#payments_add').show();
-    });