From e9ce1dd51ff97444d0709b492f6fdb72de3d3fab Mon Sep 17 00:00:00 2001 From: Loos Date: Mon, 13 Oct 2014 22:14:30 -0400 Subject: [PATCH] Louis | Adds minimally styled client reciepts --- app/assets/stylesheets/client_receipt.scss | 15 +++++ app/models/client.rb | 4 ++ app/views/freecyclery/receipt.html.haml | 76 +++++++++++++++++++++- notes.txt | 5 +- 4 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 app/assets/stylesheets/client_receipt.scss diff --git a/app/assets/stylesheets/client_receipt.scss b/app/assets/stylesheets/client_receipt.scss new file mode 100644 index 0000000..c9440b8 --- /dev/null +++ b/app/assets/stylesheets/client_receipt.scss @@ -0,0 +1,15 @@ +.freecyclery-receipt{ + h2 { + font-size: 18px; + } + .horizontal-line{ + width: 100%; + border-bottom: 5px solid black; + } + .receipt{ + margin: 10px; + border: 5px solid black; + height: 400px; + } + +} diff --git a/app/models/client.rb b/app/models/client.rb index 09b8195..18b3138 100644 --- a/app/models/client.rb +++ b/app/models/client.rb @@ -17,4 +17,8 @@ class Client < ActiveRecord::Base Client.all.select{|client| client.application_voided || client.completion_date} end + def bike + Bike.find(self.bike_id) + end + end diff --git a/app/views/freecyclery/receipt.html.haml b/app/views/freecyclery/receipt.html.haml index b79074f..c313c37 100644 --- a/app/views/freecyclery/receipt.html.haml +++ b/app/views/freecyclery/receipt.html.haml @@ -1 +1,75 @@ -KITTENS +.containter.freecyclery-receipt + .col-xs-6 + .receipt + %h2 + %strong= @client.bike.name + %br + = 'Log Number: ' + @client.bike.log_number.to_s + %br + .horizontal-line + .client-information + = @client.name + %br + = @client.agency.agency_name + .horizontal-line + %br + = 'Paid $25 for lock and helmet' if @client.will_pay + %br + Includes: + %br + = 'Helmet' if @client.helmet + %br + = 'Lock' if @client.lock + %br + %br + Date Received + %br + _______________ + %br + Client Signature + %br + ________________ + %br + Recyclery Volunteer Initials + %br + ___ + %br + CLIENT COPY + + .col-xs-6 + .receipt + %h2 + %strong= @client.bike.name + %br + = 'Log Number: ' + @client.bike.log_number.to_s + %br + .horizontal-line + .client-information + = @client.name + %br + = @client.agency.agency_name + .horizontal-line + %br + = 'Paid $25 for lock and helmet' if @client.will_pay + %br + Includes: + %br + = 'Helmet' if @client.helmet + %br + = 'Lock' if @client.lock + %br + %br + Date Received + %br + _______________ + %br + Client Signature + %br + ________________ + %br + Recyclery Volunteer Initials + %br + ___ + %br + RECYCLERY COPY + diff --git a/notes.txt b/notes.txt index d748adb..845b85b 100644 --- a/notes.txt +++ b/notes.txt @@ -1,7 +1,4 @@ Freecyclery Receipts - Prints two quarter sheet receipts -- one for client, one for Recyclery. Includes: - Client Name, Agency, Bike Log Number (make and model too?), Helmet Needed?, Lock Needed?, Will Pay $25 upon receipt of lock and helmet? - Also blanks for Client Signature, Date Received, and Recyclery Volunteer Initials. Reports Number of bikes sold by year or month. (Bar graph for extra points!) @@ -10,6 +7,8 @@ Reports Average bike price for year. +get receipt from client +style client receipts assign a bike from the available freecyclery bikes page mark as picked up from the ready for pickup page validations around parameters that break site if incomplete