payday 1.0.2 → 1.0.3

data/README.md

@@ -113,6 +113,8 @@ We've had some awesome contributers:
 * Pierre Olivier Martel ([pomartel](http://github.com/pomartel))
 * Matt Hoofman ([mhoofman](https://github.com/mhoofman))
 * Édouard Brière ([edouard](https://github.com/edouard))
+* Jim Jones ([aantix](https://github.com/aantix))
+* Hussein Morsy ([husseinmorsy](https://github.com/husseinmorsy))
 
 To Do
 ===
@@ -153,4 +155,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/lib/payday/line_item.rb

@@ -7,11 +7,13 @@ module Payday
   class LineItem
     include LineItemable
     
-    attr_accessor :description, :quantity, :price
+    attr_accessor :description, :quantity, :display_quantity, :display_price, :price
     
     # Initializes a new LineItem
     def initialize(options = {})
       self.quantity = options[:quantity] || "1"
+      self.display_quantity = options[:display_quantity]
+      self.display_price = options[:display_price]
       self.price = options[:price] || "0.00"
       self.description = options[:description] || ""
     end

data/lib/payday/locale/de.yml

@@ -5,15 +5,17 @@ de:
       paid: BEZAHLT
     invoice: 
       bill_to: Rechnung an
-      due_date: "Fälligkeit:"
+      ship_to: Versenden an
       invoice_no: "Rechnungsnr.:"
+      due_date: "Fälligkeit:"
       paid_date: "Zahlungsdatum:"
-      ship_to: Versenden an
       subtotal: "Zwischensumme:"
+      shipping: "Versand:"
       tax: "Steuern:"
       total: "Gesamt:"
+      notes: "Anmerkungen"
     line_item: 
-      amount: Betrag
       description: Beschreibung
+      unit_price: Stückpreis
       quantity: Menge
-      unit_price: Stückpreis
+      amount: Betrag

data/lib/payday/locale/en.yml

@@ -17,4 +17,4 @@ en:
       description: Description
       unit_price: Unit Price
       quantity: Quantity
-      amount: Amount
+      amount: Amount

data/lib/payday/locale/es.yml

@@ -5,15 +5,17 @@ es:
       paid: PAGADO
     invoice: 
       bill_to: Facturar a
-      due_date: "Vencimiento:"
       invoice_no: "Recibo #:"
-      paid_date: "Pagado en:"
+      due_date: "Vencimiento:"
       ship_to: Enviar a
+      paid_date: "Pagado en:"
       subtotal: "Subtotal:"
+      shipping: "Envío:"
       tax: "Impuesto:"
       total: "Total:"
+      notes: "Notas"
     line_item: 
-      amount: Cantidad
       description: Descripción
+      unit_price: Precio por Unidad
       quantity: Cantidad
-      unit_price: Precio por Unidad
+      amount: Cantidad

data/lib/payday/locale/fr.yml

@@ -10,10 +10,12 @@ fr:
       due_date: "Paiment dû le:"
       paid_date: "Payé le:"
       subtotal: "Sous-total:"
+      shipping: "Livraison:"
       tax: "Taxe:"
       total: "Total:"
+      notes: "Notes"
     line_item:
       description: Description
       unit_price: Prix unitaire
       quantity: Quantité
-      amount: Montant
+      amount: Montant

data/lib/payday/pdf_renderer.rb

@@ -150,8 +150,10 @@ module Payday
             bold_cell(pdf, I18n.t('payday.line_item.quantity', :default => "Quantity"), :align => :center, :borders => []), 
             bold_cell(pdf, I18n.t('payday.line_item.amount', :default => "Amount"), :align => :center, :borders => [])]
         invoice.line_items.each do |line|
-          table_data << [line.description, number_to_currency(line.price, invoice), BigDecimal.new(line.quantity.to_s).to_s("F"),
-              number_to_currency(line.amount, invoice)]
+          table_data << [line.description,
+                         (line.display_price || number_to_currency(line.price, invoice)),
+                         (line.display_quantity || BigDecimal.new(line.quantity.to_s).to_s("F")),
+                         number_to_currency(line.amount, invoice)]
         end
 
         pdf.move_cursor_to(pdf.cursor - 20)

data/lib/payday/version.rb

@@ -2,5 +2,5 @@
 module Payday
   
   # Current Version
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/payday.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("prawn", "~> 0.11.1")
   s.add_dependency("money", "~> 3.6.1")
-  s.add_dependency("i18n", "~> 0.5.0")
+  s.add_dependency("i18n", ">= 0.5.0")
 
   s.add_development_dependency("minitest")
 

metadata

@@ -2,7 +2,7 @@
 name: payday
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Alan Johnson
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-10 00:00:00 -04:00
+date: 2011-05-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         version: 0.5.0
   type: :runtime