From b202984fa9f2ea4704e4b6e48a7c688aeea616c1 Mon Sep 17 00:00:00 2001
From: Rishabh Saxena <orishabh1@gmail.com>
Date: Sat, 18 Jun 2016 18:32:21 +0530
Subject: [PATCH] update ticket purchase and conference registration views for
 new structure

---
 .../conference_registrations/show.html.haml   | 43 ++++++++++---------
 app/views/tickets/_ticket.html.haml           |  2 +-
 app/views/tickets/index.html.haml             | 11 +++--
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/views/conference_registrations/show.html.haml b/app/views/conference_registrations/show.html.haml
index 30cb281b..3998d851 100644
--- a/app/views/conference_registrations/show.html.haml
+++ b/app/views/conference_registrations/show.html.haml
@@ -89,29 +89,30 @@
           %span.fa-stack
             %i.fa.fa-square-o.fa-stack-2x
             %i.fa.fa-ticket.fa-stack-1x
-          Tickets
+          Ticket Purchases
           -if @tickets.any?
-            = "(#{@total_price} #{@tickets.first.price.symbol})"
+            = "(#{@tickets.first.price.symbol}#{humanized_money @total_price})"
         %ul
-          - @tickets.each do |ticket|
-            %li
-              = ticket.quantity
-              = ticket.title
-              = word_pluralize(ticket.quantity, 'Ticket')
-              for
-              = humanized_money ticket.price
-              = ticket.price.symbol
-              = link_to conference_ticket_purchase_path(@conference.short_title, ticket.id), method: :delete,
-                                                                                            id: "ticket-#{ticket.id}-delete",
-                                                                                            class: 'btn btn-danger btn-xs',
-                                                                                            data: { confirm: "Do you really want to delete the #{ticket.title} ticket for #{@conference.title}?" } do
-                %i.fa.fa-trash-o
-          %li
-            - if @tickets.any?
-              = link_to 'Buy more tickets', conference_tickets_path(@conference.short_title)
-            - else
-              You haven't bought any tickets.
-              = link_to 'Please buy some tickets to support us!', conference_tickets_path(@conference.short_title)
+          .col.md-4
+            - @ticket_payments.each_pair do |payment, tickets|
+              %strong
+                Purchased
+              - tickets.each do |ticket|
+                %li
+                  = ticket.quantity
+                  = ticket.title
+                  = word_pluralize(ticket.quantity, 'Ticket')
+                  for
+                  = ticket.price.symbol
+                  = humanized_money ticket.price
+              %hr
+          - if @tickets.any?
+            = link_to 'Buy more tickets', conference_tickets_path(@conference.short_title), class: "btn btn-default"
+          - else
+            You haven't bought any tickets.
+            = link_to 'Please buy some tickets to support us!', conference_tickets_path(@conference.short_title)
+            %p
+              (Your registration won't be complete without buying a ticket)
 
   .row
     .col-md-12
diff --git a/app/views/tickets/_ticket.html.haml b/app/views/tickets/_ticket.html.haml
index c31703b3..7473f96d 100644
--- a/app/views/tickets/_ticket.html.haml
+++ b/app/views/tickets/_ticket.html.haml
@@ -9,7 +9,7 @@
           = markdown(ticket.description)
   %td.col-sm-1.col-md-1
     - if ticket.bought?(current_user)
-      = text_field_tag("tickets[][#{ticket.id}]", ticket.quantity_bought_by(current_user),
+      = text_field_tag("tickets[][#{ticket.id}]", 0,
       type: 'number', min: 0, class: "form-control quantity", 'data-id' => ticket.id)
     - else
       = text_field_tag("tickets[][#{ticket.id}]", 0, type: 'number', min: 0,
diff --git a/app/views/tickets/index.html.haml b/app/views/tickets/index.html.haml
index fbc2df7c..1852d60d 100644
--- a/app/views/tickets/index.html.haml
+++ b/app/views/tickets/index.html.haml
@@ -5,10 +5,10 @@
         %h1
           Tickets
       %p.lead
-        If you like, support
+        Please choose your tickets for 
         %strong
           = @conference.title
-        by buying a ticket*
+        here*
       =form_tag(conference_ticket_purchases_path, method: :post) do |f|
         %table.table.table-hover
           %thead
@@ -35,12 +35,11 @@
         .pull-right
           .btn-group-vertical
             = button_tag(type: 'submit', class: 'btn btn-success btn-lg') do
-              Support
+              Continue
               %i.fa.fa-shopping-cart
-            = link_to 'Continue without a Ticket!', conference_conference_registration_path(@conference.short_title),
-            class: 'btn btn-danger btn-sm'
+            = link_to 'Cancel registration', conference_conference_registrations_path(@conference.short_title), method: :delete, class: 'btn btn-danger btn-sm'
   .row
     .col-md-13
       %p.text-muted.text-center
         %small
-          * Buying a ticket is not mandatory. Checkout will be at the conference registration.
+          * Buying a ticket is mandatory. Your registration will not complete until you buy a ticket.