billme 0.6.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79874c966435e3d0ddd1c24f89c0f9c48caa02a4
-  data.tar.gz: 7ef092fc9824125c5dfe536525a8a24b8ad75c30
+  metadata.gz: e0aa2c619e4d3ed3a0d7155eda9d2a925e878a9f
+  data.tar.gz: 99451401737c4ddca46f4910357898cf4407a61d
 SHA512:
-  metadata.gz: ed7f4d316bf7590867c869dcd164a3733aef0ed4b8e61da257fc3c557cdf6d15b664d9f592384850fef65a0bf956ddec14a8fe02ad706c5a9d6f18f996df6583
-  data.tar.gz: 85b243b99c2cc772280d54ba491301fbed6868c4c8620c02730da064a58f30cbaf1cc5d3bca5bba2d8aa3b1621d777a5b7a2158495cb27ffb79ad5c108194492
+  metadata.gz: d81c1a008294ca1394429b6ec7ad62106760f94e6bbebda1dbda78e4e3e65688baeca3b205cbaea2519e1ffd08c2b392b564c36ad84d2c48a93ede143dcb4611
+  data.tar.gz: ba0a8b55e8405695591ba38e49fbf5328ff982aba0d49144a3a9a778fe2c4d3ad68a4e91989ad24c94a1c740836c279f22cb94b6c8f4a2319c13da9862980b74

data/example.rb

@@ -20,6 +20,7 @@ Billme.bill do
     name "Federation"
     date "2015-05-05"
     due_date "2015-06-05"
+    bill_date "2015-06-01"
     address "Earth"
     email "starfleet@earth.com"
     vat "1234567891011"
@@ -27,18 +28,17 @@ Billme.bill do
 
   services do
     tax "0.25"
+    currency "$"
     service do
       name "Engage Romulans"
       description "Warmup for battle"
       unit "1000"
-      currency "$"
       quantity "1"
     end
     service do
       name "Rescue mission"
       description "Rescue captive away teams"
       unit "2000"
-      currency "$"
       quantity "2"
     end
   end

data/lib/billme/factory.rb

@@ -25,6 +25,7 @@ module Billme
       @data[:services] = section.data
       @data[:services][:total] = section.total
       @data[:services][:subtotal] = section.subtotal
+      @data[:services][:tax_percentage] = section.data[:tax].to_f * 100
       @data[:services][:tax] = section.total - section.subtotal
     end
 

data/lib/billme/version.rb

@@ -1,3 +1,3 @@
 module Billme
-  VERSION = "0.6.0"
+  VERSION = "0.13.0"
 end

data/lib/billme/views/bill.html.erb

@@ -17,16 +17,16 @@
   <% end %>
   <h1>INVOICE <%= @data[:number] %></h1>
   <div id="company" class="clearfix">
-    <div><%= @data[:company][:company_name] %></div>
-    <div><%= @data[:company][:company_address] %><br /> <%= @data[:company][:company_city] %>, <%= @data[:company][:company_country] %></div>
+    <div>ISSUED BY: <%= @data[:company][:company_name] %></div>
+    <div>ADDRESS: <%= @data[:company][:company_address] %><br /> <%= @data[:company][:company_city] %>, <%= @data[:company][:company_country] %></div>
     <% if @data[:company][:company_phone] %>
-      <div><%= @data[:company][:company_phone] %></div>
+      <div>PHONE: <%= @data[:company][:company_phone] %></div>
     <% end %>
     <% if @data[:client][:vat] %>
       <div>VAT ID: <%= @data[:client][:vat] %></div>
     <% end %>
     <% if @data[:company][:company_email] %>
-      <div><a href="mailto:<%= @data[:company][:company_email] %>"><%= @data[:company][:company_email] %></a></div>
+      <div>EMAIL: <a href="mailto:<%= @data[:company][:company_email] %>"><%= @data[:company][:company_email] %></a></div>
     <% end %>
   </div>
   <div id="project">
@@ -38,7 +38,8 @@
     <% if @data[:client][:email] %>
       <div><span>EMAIL</span> <a href="mailto:<%= @data[:client][:email] %>"><%= @data[:client][:email] %></a></div>
     <% end %>
-    <div><span>DATE</span> <%= @data[:client][:date] %></div>
+    <div><span>BILL DATE</span> <%= @data[:client][:bill_date] %></div>
+    <div><span>DELIVERED</span> <%= @data[:client][:date] %></div>
     <div><span>DUE DATE</span> <%= @data[:client][:due_date] %></div>
   </div>
 </header>
@@ -58,23 +59,23 @@
     <tr>
       <td class="service"><%= service[:name] %></td>
       <td class="desc"><%= service[:description] %></td>
-      <td class="unit"><%= service[:unit] %><%= service[:currency] %></td>
+      <td class="unit"><%= service[:unit] %><%= @data[:services][:currency] %></td>
       <td class="qty"><%= service[:quantity] %></td>
-      <td class="total"><%= service[:quantity].to_i * service[:unit].to_i %><%= service[:currency] %></td>
+      <td class="total"><%= service[:quantity].to_i * service[:unit].to_i %><%= @data[:services][:currency] %></td>
     </tr>
     <% end %>
     <tr>
-      <td colspan="4">SUBTOTAL</td>
-      <td class="total"><%= @data[:services][:subtotal] %></td>
+      <td colspan="3">SUBTOTAL</td>
+      <td class="total"><td class="total"><%= @data[:services][:subtotal] %><%= @data[:services][:currency] %></td></td>
     </tr>
     <tr>
-      <td colspan="4">TAX 25%</td>
-      <td class="total"><td class="total"><%= @data[:services][:tax] %></td>
+      <td colspan="3">TAX <%= @data[:services][:tax_percentage] %>%</td>
+      <td class="total"><td class="total"><%= @data[:services][:tax] %><%= @data[:services][:currency] %></td>
       </td>
     </tr>
     <tr>
-      <td colspan="4" class="grand total">TOTAL</td>
-      <td class="grand total"><td class="total"><%= @data[:services][:total] %></td>
+      <td colspan="3" class="grand total">TOTAL</td>
+      <td class="grand total"><td class="total"><%= @data[:services][:total] %><%= @data[:services][:currency] %></td>
       </td>
     </tr>
     </tbody>

data/lib/billme/views/style.css

@@ -55,7 +55,7 @@ h1 {
     color: #5D6975;
     text-align: right;
     width: 52px;
-    margin-right: 10px;
+    margin-right: 12px;
     display: inline-block;
     font-size: 0.8em;
 }

data/output.html

@@ -62,7 +62,7 @@ h1 {
     color: #5D6975;
     text-align: right;
     width: 52px;
-    margin-right: 10px;
+    margin-right: 21px;
     display: inline-block;
     font-size: 0.8em;
 }
@@ -148,14 +148,16 @@ footer {
   
   <h1>INVOICE 2016-1-1</h1>
   <div id="company" class="clearfix">
-    <div>Enterprise LLC</div>
-    <div>The Neutral Zone 123<br /> Beta Quadrant, Universe</div>
+    <div>ISSUED BY: Enterprise LLC</div>
+    <div>ADDRESS: The Neutral Zone 123<br /> Beta Quadrant, Universe</div>
     
-      <div>+ 123 123 123 1</div>
+      <div>PHONE: + 123 123 123 1</div>
     
     
+      <div>VAT ID: 1234567891011</div>
     
-      <div><a href="mailto:uss@ncc1701.com">uss@ncc1701.com</a></div>
+    
+      <div>EMAIL: <a href="mailto:uss@ncc1701.com">uss@ncc1701.com</a></div>
     
   </div>
   <div id="project">
@@ -167,7 +169,8 @@ footer {
     
       <div><span>EMAIL</span> <a href="mailto:starfleet@earth.com">starfleet@earth.com</a></div>
     
-    <div><span>DATE</span> 2015-05-05</div>
+    <div><span>BILL DATE</span> 2015-06-01</div>
+    <div><span>DATE DELIVERED</span> 2015-05-05</div>
     <div><span>DUE DATE</span> 2015-06-05</div>
   </div>
 </header>
@@ -201,17 +204,17 @@ footer {
     </tr>
     
     <tr>
-      <td colspan="4">SUBTOTAL</td>
-      <td class="total">3750.0</td>
+      <td colspan="3">SUBTOTAL</td>
+      <td class="total"><td class="total">3750.0$</td></td>
     </tr>
     <tr>
-      <td colspan="4">TAX 25%</td>
-      <td class="total"><td class="total">1250.0</td>
+      <td colspan="3">TAX 25.0%</td>
+      <td class="total"><td class="total">1250.0$</td>
       </td>
     </tr>
     <tr>
-      <td colspan="4" class="grand total">TOTAL</td>
-      <td class="grand total"><td class="total">5000</td>
+      <td colspan="3" class="grand total">TOTAL</td>
+      <td class="grand total"><td class="total">5000$</td>
       </td>
     </tr>
     </tbody>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: billme
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Hrvoje G