piggybak 0.2.1 → 0.3.0

data/LICENSE

@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

data/README.md

@@ -102,12 +102,10 @@ Recipes
 TODOs
 ========
 
-* Bug: Handle state options in admin: selected state or free text
-* Feature: Figure out how to make entire payments section read only, except for ability to refund
-* Feature: Add refunds: Add actionable link under payments, include on payments page only
-* Feature: Create rake task for copying over views, and make sure app views will override gems
 * Test: Test email send functionality
 * Test: Add unit testing
+* Feature: Add API to call Refund if profiles only
+* Feature: Add helper for Google Analytics order tagging
 
 Copyright
 ========

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/app/assets/javascripts/piggybak.js

@@ -1,58 +1,17 @@
 var tax_total = 0;
-var geodata;
 
 $(function() {
-	piggybak.populate_geodata();
 	piggybak.initialize_listeners();
 	piggybak.update_shipping_options($('#piggybak_order_shipping_address_attributes_state_id'));
 	piggybak.update_tax();
 });
 
 var piggybak = {
-	populate_geodata: function() {
-		$.ajax({
-			url: geodata_lookup,
-			cached: false,
-			dataType: "JSON",
-			success: function(data) {
-				geodata = data;
-			}
-		});
-	},
-	update_state_option: function(type, block) {
-		var country_field = $('#piggybak_order_' + type + '_address_attributes_country_id');
-		var country_id = country_field.val();
-		var new_field;
-
-		if(geodata.countries["country_" + country_id].length > 0) {
-			new_field = $('<select>');
-			$.each(geodata.countries["country_" + country_id], function(i, j) {
-				new_field.append($('<option>').val(j.id).html(j.name));
-			});	
-		} else {
-			new_field = $('<input>');
-		}
-		var old_field = $('#piggybak_order_' + type + '_address_attributes_state_id');
-		new_field.attr('name', old_field.attr('name'));
-		new_field.attr('id', old_field.attr('id'));
-		old_field.replaceWith(new_field);
-
-		if(block) {
-			block();
-		}
-		return;
-	},
 	initialize_listeners: function() {
-		$('#piggybak_order_shipping_address_attributes_country_id').change(function() {
-			piggybak.update_state_option('shipping');
-		});
-		$('#piggybak_order_billing_address_attributes_country_id').change(function() {
-			piggybak.update_state_option('billing');
-		});
-		$('#piggybak_order_shipping_address_attributes_state_id').change(function() {
+		$('#piggybak_order_shipping_address_attributes_state_id').live('click', function() {
 			piggybak.update_shipping_options($(this));
 		});
-		$('#piggybak_order_billing_address_attributes_state_id').change(function() {
+		$('#piggybak_order_billing_address_attributes_state_id').live('change', function() {
 			piggybak.update_tax();
 		});
 		$('#shipping select').change(function() {
@@ -71,7 +30,7 @@ var piggybak = {
 		});
 		var country = $('#piggybak_order_billing_address_attributes_country_id').val();
 		$('#piggybak_order_shipping_address_attributes_country_id').val(country);
-		piggybak.update_state_option('shipping', function() {
+		piggybak_states.update_state_option('shipping', function() {
 			var state = $('#piggybak_order_billing_address_attributes_state_id').val();
 			$('#piggybak_order_shipping_address_attributes_state_id').val(state);
 		});

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

@@ -0,0 +1,52 @@
+var geodata;
+
+$(function() {
+	piggybak_states.populate_geodata();
+	piggybak_states.initialize_listeners();
+});
+
+var piggybak_states = {
+	initialize_listeners: function() {
+		$('#piggybak_order_shipping_address_attributes_country_id').change(function() {
+			piggybak_states.update_state_option('shipping');
+		});
+		$('#piggybak_order_billing_address_attributes_country_id').change(function() {
+			piggybak_states.update_state_option('billing');
+		});
+		return;
+	},
+	populate_geodata: function() {
+		$.ajax({
+			url: geodata_lookup,
+			cached: false,
+			dataType: "JSON",
+			success: function(data) {
+				geodata = data;
+				piggybak_states.update_state_option('shipping');
+				piggybak_states.update_state_option('billing');
+			}
+		});
+	},
+	update_state_option: function(type, block) {
+		var country_field = $('#piggybak_order_' + type + '_address_attributes_country_id');
+		var country_id = country_field.val();
+		var new_field;
+
+		if(geodata.countries["country_" + country_id].length > 0) {
+			new_field = $('<select>');
+			$.each(geodata.countries["country_" + country_id], function(i, j) {
+				new_field.append($('<option>').val(j.id).html(j.name));
+			});	
+		} else {
+			new_field = $('<input>');
+		}
+		var old_field = $('#piggybak_order_' + type + '_address_attributes_state_id');
+		new_field.attr('name', old_field.attr('name')).attr('id', old_field.attr('id')).val(old_field.val());
+		old_field.replaceWith(new_field);
+
+		if(block) {
+			block();
+		}
+		return;
+	}
+};

data/app/controllers/piggybak/orders_controller.rb

@@ -86,6 +86,20 @@ module Piggybak
       redirect_to rails_admin.edit_path('Piggybak::Order', order.id)
     end
 
+    def cancel
+      order = Order.find(params[:id])
+
+      if can?(:cancel, order)
+        order.payments.each do |payment|
+          payment.refund
+        end
+        order.update_attribute(:status, "cancelled")
+        flash[:notice] = "Cancelled"
+      end
+
+      redirect_to rails_admin.edit_path('Piggybak::Order', order.id)
+    end
+
     # AJAX Actions from checkout
     def shipping
       cart = Piggybak::Cart.new(request.cookies["cart"])

data/app/controllers/piggybak/payments_controller.rb

@@ -0,0 +1,13 @@
+module Piggybak
+  class PaymentsController < ApplicationController
+    def refund
+      payment = Payment.find(params[:id])
+
+      if can?(:refund, payment)
+        flash[:notice] = payment.refund
+      end
+
+      redirect_to rails_admin.edit_path('Piggybak::Order', payment.order.id)
+    end
+  end
+end

data/app/models/piggybak/address.rb

@@ -14,13 +14,9 @@ module Piggybak
     after_initialize :set_default_country
 
     def set_default_country
-      self.country ||= Address.DEFAULT_COUNTRY
+      self.country ||= Country.find_by_abbr(Piggybak.config.default_country)
     end
 
-    def self.DEFAULT_COUNTRY
-      Country.find_by_abbr("US")
-    end
-      
     def admin_label
       address = "#{self.firstname} #{self.lastname}<br />"
       address += "#{self.address1}<br />"

data/app/models/piggybak/country.rb

@@ -1,5 +1,8 @@
 module Piggybak
   class Country < ActiveRecord::Base
     has_many :states
+
+    scope :shipping, where(:active_shipping => true)
+    scope :billing, where(:active_billing => true)
   end
 end

data/app/models/piggybak/order.rb

@@ -36,25 +36,13 @@ module Piggybak
       end
 
       self.total_due = self.total
-      payments.each do |payment|
-        self.total_due -= payment.total
-      end
-      !has_errors
-    end
+      payments_total = payments.inject(0) do |payments_total, payment|
+        payments_total += payment.total if payment.status == "paid"
+        payments_total
+      end 
+      self.total_due -= payments_total
 
-    def details
-      if !self.new_record? 
-        subtotal = self.line_items.inject(0) { |subtotal, li| subtotal + li.total }
-        shipping = self.shipments.inject(0) { |shipping, shipment| shipping + shipment.total }
-        return "Status: #{self.status}<br />" +
-          "Subtotal: $#{"%.2f" % subtotal}<br />" + 
-          "Shipping: $#{"%.2f" % shipping}<br />" + 
-          "Tax: $#{"%.2f" % self.tax_charge}<br />" + 
-          "Due: $#{"%.2f" % self.total_due}<br />" + 
-          "Created at: #{self.created_at.strftime("%m-%d-%Y")}<br />" #details here"
-      else
-        return "New Order"
-      end
+      !has_errors
     end
 
     def add_line_items(cart)
@@ -106,11 +94,15 @@ module Piggybak
 
       self.total_due = self.total
       payments.each do |payment|
-        self.total_due -= payment.total
+        if payment.status == "paid"
+          self.total_due -= payment.total
+        end
       end
     end
 
     def update_status
+      return if self.status == "cancelled"  # do nothing
+
       if self.total_due > 0.00
         self.status = "payment owed"
       elsif self.total_due < 0.00

data/app/models/piggybak/payment.rb

@@ -31,6 +31,8 @@ module Piggybak
     end
 
     def process
+      ActiveMerchant::Billing::Base.mode = Piggybak.config.activemerchant_mode
+
       if self.new_record?
         payment_gateway = self.payment_method.klass.constantize
         gateway = payment_gateway::KLASS.new(self.payment_method.key_values)
@@ -52,6 +54,31 @@ module Piggybak
       end
     end
 
+    # TODO: Add refund support at some point
+    # Note: It is not added now, because for methods that do not store
+    # user profiles, a credit card number must be passed
+    # If encrypted credit cards are stored on the system,
+    # this can be updated
+    def refund
+=begin
+      # ActiveMerchant::Billing::Base.mode = Piggybak.config.activemerchant_mode
+
+      begin
+        payment_gateway = self.payment_method.klass.constantize
+        gateway = payment_gateway::KLASS.new(self.payment_method.key_values)
+       
+        b = gateway.refund(self.total*100, self.transaction_id, { :card_number => "4111111111111111" })
+      rescue Exception => e
+        return e.inspect
+      end
+=end
+
+      self.update_attribute(:status, "refunded")
+      self.order.update_attribute(:total_due, self.order.total_due + self.total)
+
+      return "Marked as Refunded"
+    end
+
     def admin_label
       if !self.new_record? 
         return "Payment ##{self.id} (#{self.created_at.strftime("%m-%d-%Y")})<br />" + 

data/app/models/piggybak/tax_calculator/percent.rb

@@ -1,16 +1,18 @@
 module Piggybak
   class TaxCalculator::Percent
-    KEYS = ["state_abbr", "rate"]
+    KEYS = ["state_id", "rate"]
 
     def self.available?(method, object)
-      abbr = method.metadata.detect { |t| t.key == "state_abbr" }.value
+      id = method.metadata.detect { |t| t.key == "state_id" }.value
 
       if object.is_a?(Cart)
-        state = State.find(object.extra_data["state_id"])
-        return state.abbr == abbr
+        if object.extra_data["state_id"] != ""
+          state = State.find(object.extra_data["state_id"])
+          return state.id == id.to_i if state
+        end
       else
         if object.billing_address && object.billing_address.state 
-          return object.billing_address.state.abbr == abbr
+          return object.billing_address.state.id == id.to_i
         end
       end
       return false

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

@@ -20,11 +20,15 @@
 </div>
 <div class="item">
   <%= address.label :country_id %>
-  <%= address.collection_select :country_id, Piggybak::Country.all, :id, :name, { :selected => address.object.country_id.to_s } %>
+  <%= address.collection_select :country_id, Piggybak::Country.send(type), :id, :name, { :selected => address.object.country_id.to_s } %>
 </div>
 <div class="item">
 	<%= address.label :state_id %>
+	<% if address.object.country.states.any? -%>
 	<%= address.collection_select :state_id, address.object.country.states, :id, :name, { :selected => address.object.state_id.to_s } %>
+	<% else -%>
+	<%= address.text_field :state_id %>
+	<% end -%>
 </div>
 <div class="item">
 	<%= address.label :zip %>

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

@@ -33,7 +33,7 @@
 <div id="billing_address">
 	<h3>Billing Address</h3>
 	<%= f.fields_for :billing_address do |billing_address| %>
-	<%= render "address_form", :address => billing_address %>
+	<%= render "address_form", :address => billing_address, :type => "billing" %>
 	<% end -%>
 </div>
 <div id="shipping_address">
@@ -43,7 +43,7 @@
 	</h3>
 
 	<%= f.fields_for :shipping_address do |shipping_address| %>
-	<%= render "address_form", :address => shipping_address %>
+	<%= render "address_form", :address => shipping_address, :type => "shipping" %>
 	<% end -%>
 </div>
 
@@ -109,7 +109,7 @@
 
 </div>
 
-<%= javascript_include_tag "piggybak" %>
+<%= javascript_include_tag "piggybak", "piggybak.states" %>
 <script type="text/javascript">
 var shipping_lookup = "<%= piggybak.orders_shipping_url %>"; 
 var tax_lookup = "<%= piggybak.orders_tax_url %>"; 

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

@@ -0,0 +1,7 @@
+= form.fields_for field.name do |nested_form|
+  %blockquote
+    - if nested_form.object.new_record?
+      = nested_form.link_to_remove "cancel", :class => 'label notice'
+    = 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'

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

@@ -0,0 +1,15 @@
+:ruby
+  type = form.jquery_namespace(field).match("billing") ? "billing" : "shipping"
+
+= form.collection_select "country_id", Piggybak::Country.send(type), :id, :name, { :selected => form.object.country_id.to_s }
+
+- if form.object.country.states.any?
+  = form.collection_select "state_id", form.object.country.states, :id, :name, { :selected => form.object.state_id.to_s }
+- else
+  = form.text_field "state_id"
+
+- if type == "billing"
+  = javascript_include_tag "piggybak.states"
+
+:javascript
+  var geodata_lookup = "#{piggybak.orders_geodata_url}";

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

@@ -0,0 +1,38 @@
+:ruby
+  config = field.associated_model_config
+  related_id = params[:associations] && params[:associations][field.name.to_s]
+  source_abstract_model = RailsAdmin.config(form.object.class).abstract_model
+  
+  if form.object.new_record? && related_id.present? && related_id != 'new'
+    selected = config.abstract_model.get(related_id)
+    selected_id = selected.id
+    selected_name = selected.send(config.object_label_method)
+  else
+    selected_id = field.selected_id
+    selected_name = field.formatted_value
+  end
+
+  current_action = params[:action].in?(['create', 'new']) ? 'create' : 'update'
+
+  edit_url = authorized?(:edit, config.abstract_model) ? edit_path(:model_name => config.abstract_model.to_param, :modal => true, :id => '__ID__') : ''
+  
+  xhr = !field.associated_collection_cache_all
+
+  collection = xhr ? [[selected_name, selected_id]] : controller.list_entries(config, :index, field.associated_collection_scope, false).map { |o| [o.send(config.object_label_method), o.id] }
+
+= form.select field.method_name, collection, { :selected => selected_id, :include_blank => true }, field._html_attributes.reverse_merge({:placeholder => t('admin.index.search')})
+
+= form.javascript_for(field) do
+  :plain
+    $("#{form.jquery_namespace(field)} select").filteringSelect({
+      xhr: #{xhr},
+      createQuery: function(query) {
+        return { query: query }
+      },
+      remote_source: "#{index_path(config.abstract_model.to_param, :source_object_id => form.object.id, :source_abstract_model => source_abstract_model.to_param, :associated_collection => field.name, :current_action => current_action, :compact => true).html_safe}"
+    });
+    if($("#modal").length) { // hide link if we already are inside a dialog (endless issues on nested dialogs with JS)
+      $("#{form.jquery_namespace(field)} .btn").hide();
+    } else {
+      $("#{form.jquery_namespace(field)}").remoteForm();
+    }

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

@@ -0,0 +1,44 @@
+<% if form.object.new_record? %>
+N/A
+<% else -%>
+<table cellpadding="0" cellspacing="0">
+	<tr>
+		<td>Status</td>
+		<td><%= form.object.status %></td>
+	</tr>
+	<tr>
+		<td>Subtotal</td>
+		<td>$<%= "%.2f" % form.object.line_items.inject(0) { |subtotal, li| subtotal + li.total } %></td>
+	</tr>
+	<tr>
+		<td>Shipping</td>
+		<td>$<%= "%.2f" % form.object.shipments.inject(0) { |shipping, shipment| shipping + shipment.total } %></td>
+	</tr>
+	<tr>
+		<td>Tax</td>
+		<td>$<%= "%.2f" % form.object.tax_charge %></td>
+	</tr>
+	<tr>
+		<td>Order Total</td>
+		<td>$<%= "%.2f" % form.object.total %></td>
+	</tr>
+	<tr>
+		<td>Total Due</td>
+		<td>$<%= "%.2f" % form.object.total_due %></td>
+	</tr>
+	<tr>
+		<td>Created At</td>
+		<td><%= form.object.created_at.strftime("%m-%d-%Y") %></td>
+	</tr>
+	<tr>
+		<td>Actions</td>
+		<td>
+			<ul>
+				<li><%= link_to "Send 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>
+			</ul>
+		</td>
+	</tr>
+</table>
+<% end -%>

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

@@ -0,0 +1,6 @@
+- if form.object.new_record?
+  N/A
+-elsif form.object.status == "refunded"
+  Payment Marked as Refunded
+- else
+  = link_to "Mark as Refunded", piggybak.refund_payment_url(form.object.id)

data/config/routes.rb

@@ -18,7 +18,9 @@ Piggybak::Engine.routes.draw do
     match "/orders" => "orders#list", :as => :orders_list
 
     # admin actions
-    match "/admin/orders/:id/email" => "orders#email", :as => :orders_email
-    match "/admin/orders/:id/download" => "orders#download", :as => :orders_download, :format => "txt"
+    match "/admin/orders/:id/email" => "orders#email", :as => :email_order
+    match "/admin/orders/:id/download" => "orders#download", :as => :download_order, :format => "txt"
+    match "/admin/orders/:id/cancel" => "orders#cancel", :as => :cancel_order
+    match "/admin/payments/:id/refund" => "payments#refund", :as => :refund_payment
   end
 end

data/db/migrate/20120107135459_add_active_to_countries.rb

@@ -0,0 +1,11 @@
+class AddActiveToCountries < ActiveRecord::Migration
+  def up
+    add_column :countries, :active_shipping, :boolean, :default => false
+    add_column :countries, :active_billing, :boolean, :default => false
+  end
+
+  def down
+    remove_column :countries, :active_shipping
+    remove_column :countries, :active_billing
+  end
+end

data/lib/piggybak.rb

@@ -79,14 +79,11 @@ module Piggybak
           end
           edit do
             field :details do
-              read_only true
-              help "Autopopulated"
-            end
-            field :actions do
-              partial "actions"
+              partial "order_details"
               help ""
             end
             field :user do
+              partial "no_edit_form_filtering_select"
               read_only do
                 !bindings[:object].new_record?
               end
@@ -101,7 +98,9 @@ module Piggybak
             end
             field :line_items
             field :shipments
-            field :payments
+            field :payments do
+              partial "form_nested_no_destroy"
+            end
           end
         end
       
@@ -110,6 +109,20 @@ module Piggybak
           parent Piggybak::Order
           object_label_method :admin_label
           visible false
+
+          edit do
+            field :firstname
+            field :lastname
+            field :address1
+            field :address2
+            field :city
+            field :zip
+            field :location do
+              partial "location_select"
+              help "Required"
+              label "Country & State"
+            end
+          end
         end
       
         config.model Piggybak::LineItem do
@@ -118,7 +131,9 @@ module Piggybak
           visible false
 
           edit do
-            field :variant
+            field :variant do
+              partial "no_edit_form_filtering_select"
+            end
             field :quantity
             field :total do
               read_only true
@@ -136,7 +151,9 @@ module Piggybak
           visible false
 
           edit do
-            field :shipping_method
+            field :shipping_method do
+              partial "no_edit_form_filtering_select"
+            end
             field :status
             field :total do
               read_only true
@@ -154,11 +171,8 @@ module Piggybak
           visible false
 
           edit do
-            #field :details do
-            #  read_only true
-            #  help "Autopopulated"
-            #end
             field :payment_method do
+              partial "no_edit_form_filtering_select"
               read_only do 
                 !bindings[:object].new_record?
               end 
@@ -169,11 +183,13 @@ module Piggybak
               end 
             end
             field :month do
+              label "Exp. Month"
               read_only do 
                 !bindings[:object].new_record?
               end 
             end
             field :year do
+              label "Exp. Year"
               read_only do 
                 !bindings[:object].new_record?
               end 
@@ -190,6 +206,10 @@ module Piggybak
               end
               help "This will automatically be calculated at the time of processing."
             end
+            field :actions do
+              partial "payment_refund"
+              help "Admin driven refunds are not supported because credit cards are not stored."
+            end
           end
         end
       
@@ -299,6 +319,8 @@ module Piggybak
           edit do
             field :name
             field :abbr
+            field :active_shipping
+            field :active_billing
           end
         end
 

data/lib/piggybak/config.rb

@@ -4,6 +4,8 @@ module Piggybak
       attr_accessor :payment_calculators
       attr_accessor :shipping_calculators
       attr_accessor :tax_calculators
+      attr_accessor :default_country
+      attr_accessor :activemerchant_mode
 
       def reset
         @payment_calculators = ["::Piggybak::PaymentCalculator::Fake",
@@ -12,6 +14,10 @@ module Piggybak
                                  "::Piggybak::ShippingCalculator::Free",
                                  "::Piggybak::ShippingCalculator::Range"]
         @tax_calculators = ["::Piggybak::TaxCalculator::Percent"]
+
+        @default_country = "US"
+
+        @activemerchant_mode = :production
       end
     end
 

data/piggybak.gemspec

@@ -5,26 +5,30 @@
 
 Gem::Specification.new do |s|
   s.name = "piggybak"
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steph Skardal", "Brian Buchalter"]
-  s.date = "2012-01-07"
+  s.date = "2012-01-09"
   s.description = "Mountable ecommerce"
   s.email = "steph@endpoint.com"
   s.extra_rdoc_files = [
+    "LICENSE",
     "README.md"
   ]
   s.files = [
     ".document",
     "Gemfile",
     "Gemfile.lock",
+    "LICENSE",
     "README.md",
     "Rakefile",
     "VERSION",
     "app/assets/javascripts/piggybak.js",
+    "app/assets/javascripts/piggybak.states.js",
     "app/controllers/piggybak/cart_controller.rb",
     "app/controllers/piggybak/orders_controller.rb",
+    "app/controllers/piggybak/payments_controller.rb",
     "app/helpers/piggybak_helper.rb",
     "app/mailers/piggybak/notifier.rb",
     "app/models/piggybak/address.rb",
@@ -60,7 +64,11 @@ Gem::Specification.new do |s|
     "app/views/piggybak/orders/no_access.text.erb",
     "app/views/piggybak/orders/receipt.html.erb",
     "app/views/piggybak/orders/show.html.erb",
-    "app/views/rails_admin/main/_actions.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",
+    "app/views/rails_admin/main/_payment_refund.html.haml",
     "config/routes.rb",
     "db/migrate/20111227150106_create_orders.rb",
     "db/migrate/20111227150322_create_addresses.rb",
@@ -78,6 +86,7 @@ Gem::Specification.new do |s|
     "db/migrate/20120102162703_create_tax_method_values.rb",
     "db/migrate/20120104020930_populate_countries_and_states.rb",
     "db/migrate/20120106010412_create_credits.rb",
+    "db/migrate/20120107135459_add_active_to_countries.rb",
     "lib/acts_as_orderer/base.rb",
     "lib/acts_as_variant/base.rb",
     "lib/currency.rb",

metadata

@@ -2,7 +2,7 @@
 name: piggybak
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Steph Skardal
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-07 00:00:00 Z
+date: 2012-01-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: countries
@@ -108,17 +108,21 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE
 - README.md
 files: 
 - .document
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.md
 - Rakefile
 - VERSION
 - app/assets/javascripts/piggybak.js
+- app/assets/javascripts/piggybak.states.js
 - app/controllers/piggybak/cart_controller.rb
 - app/controllers/piggybak/orders_controller.rb
+- app/controllers/piggybak/payments_controller.rb
 - app/helpers/piggybak_helper.rb
 - app/mailers/piggybak/notifier.rb
 - app/models/piggybak/address.rb
@@ -154,7 +158,11 @@ files:
 - app/views/piggybak/orders/no_access.text.erb
 - app/views/piggybak/orders/receipt.html.erb
 - app/views/piggybak/orders/show.html.erb
-- app/views/rails_admin/main/_actions.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
+- app/views/rails_admin/main/_payment_refund.html.haml
 - config/routes.rb
 - db/migrate/20111227150106_create_orders.rb
 - db/migrate/20111227150322_create_addresses.rb
@@ -172,6 +180,7 @@ files:
 - db/migrate/20120102162703_create_tax_method_values.rb
 - db/migrate/20120104020930_populate_countries_and_states.rb
 - db/migrate/20120106010412_create_credits.rb
+- db/migrate/20120107135459_add_active_to_countries.rb
 - lib/acts_as_orderer/base.rb
 - lib/acts_as_variant/base.rb
 - lib/currency.rb
@@ -191,7 +200,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2778086706911643141
+      hash: -3349211022741350095
       segments: 
       - 0
       version: "0"

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

@@ -1,12 +0,0 @@
-<ul>
-<% if params[:action] == 'edit' -%>
-<li><%= link_to "Send Email Confirmation", piggybak.orders_email_url(params[:id]) %></li>
-<% else -%>
-<li><b>You may not send a confirmation email until you have a saved order.</b></li>
-<% end -%>
-<% if params[:action] == 'edit' -%>
-<li><%= link_to "View as Text", piggybak.orders_download_url(params[:id]) %></li>
-<% else -%>
-<li><b>You may not download until you have a saved order.</b></li>
-<% end -%>
-</ul>