Supplier mail changing and polishing

app/views/supplier/edit.html.slim

@@ -59,6 +59,6 @@
             = image_tag 'supplier/settings/iens-example.png', title: 'supplier.settings.reviews.explanation'
 
   .form-actions
-    = f.submit nil, class: 'btn btn-primary'
+    = f.submit nil, class: 'btn btn-primary submit-supplier-settings'
     '
     = link_to t("helpers.links.cancel"), supplier_root_path, class: 'btn'

app/views/suppliers/lists/_lists_table.html.slim

@@ -0,0 +1,25 @@
+table.table
+  thead
+    tr
+      th data-t='attributes.list.state' = List.human_attribute_name(:state)
+      th data-t='attributes.list.needs_help' = List.human_attribute_name(:needs_help)
+      th data-t='attributes.list.needs_payment' = List.human_attribute_name(:needs_payment)
+      th data-t='attributes.list.closed_at' = List.human_attribute_name(:closed_at)
+      th data-t='models.table' = Table.model_name.human
+      th.currency data-t='attributes.list.price' = List.human_attribute_name(:price)
+      th.timestamp data-t='attributes.list.created_at' = List.human_attribute_name(:created_at)
+      th.actions data-t='helpers.actions.title' =t 'helpers.actions.title'
+  tbody
+    - lists.each do |list|
+      tr
+        td= link_to list.state, [:suppliers, list]
+        td=show_boolean list.needs_help
+        td=show_boolean list.needs_payment
+        td.timestamp data-time=list.closed_at.try(:utc).try(:iso8601)
+        td= link_to_if list.table.present?, list.table_number, [:suppliers, list.table]
+        td.currency= list.price.present? ? currency(list.price) : '...'
+        td.timestamp data-time=list.created_at.utc.iso8601
+        td.actions
+          = link_to t('helpers.links.edit'), [:edit, :suppliers, list], class: 'btn btn-mini', data: {t: 'helpers.links.edit'}
+          '
+          = link_to t("helpers.links.destroy"), [:suppliers, list], method: :delete, data: {confirm: are_you_sure? }, class: 'btn btn-mini btn-danger', data: {t: 'helpers.links.destroy'}

app/views/suppliers/lists/active.html.slim

@@ -0,0 +1,7 @@
+- model_class = List
+div.page-header= title :index, model_class
+.well
+  - if @lists.any?
+    = render 'lists_table', lists: @lists
+  - else
+    = no_content_given model_class

app/views/suppliers/lists/at_date.html.slim

@@ -0,0 +1,12 @@
+- model_class = List
+div.page-header= title :index, model_class
+form#select-date-form.form-inline action='' method="get"
+  label for="lists-date" data-t="lists.index.show_list_on_day"
+  input#lists-date.datepicker type="text" name="date" value=@date.to_s('%Y-%m-%d')
+.well
+  - if @lists.any?
+    = render 'lists_table', lists: @lists
+  - else
+    = no_content_given model_class
+javascript:
+  window.datepicker_options['onSelect'] = function(dateText, inst){$('#select-date-form').submit()}

app/views/suppliers/lists/index.html.slim

@@ -1,39 +1,7 @@
-- model_class = List
-div.page-header= title :index, model_class
-form#select-date-form action='' method="get"
-  - if params[:show_all] == 'yes'
-  - else
-    input#lists-date.datepicker type="text" name="date" value=@date.to_s('%Y-%m-%d')
-    = link_to '', {show_all: 'yes'}, class: 'btn', data: {t: 'lists.index.show_all'}
+div.page-header= title :index, List
 .well
   - if @lists.any?
-    = paginate @lists if params[:show_all] == 'yes'
-    table.table
-      thead
-        tr
-          th data-t='attributes.list.state' = model_class.human_attribute_name(:state)
-          th data-t='attributes.list.needs_help' = model_class.human_attribute_name(:needs_help)
-          th data-t='attributes.list.needs_payment' = model_class.human_attribute_name(:needs_payment)
-          th data-t='attributes.list.closed_at' = model_class.human_attribute_name(:closed_at)
-          th data-t='models.table' = Table.model_name.human
-          th.currency data-t='attributes.list.price' = model_class.human_attribute_name(:price)
-          th.timestamp data-t='attributes.list.created_at' = model_class.human_attribute_name(:created_at)
-          th.actions data-t='helpers.actions.title' =t 'helpers.actions.title'
-      tbody
-        - @lists.each do |list|
-          tr
-            td= link_to list.state, [:suppliers, list]
-            td=show_boolean list.needs_help
-            td=show_boolean list.needs_payment
-            td.timestamp data-time=list.closed_at.try(:utc).try(:iso8601)
-            td= link_to_if list.table.present?, list.table_number, [:suppliers, list.table]
-            td.currency= list.price.present? ? currency(list.price) : '...'
-            td.timestamp data-time=list.created_at.utc.iso8601
-            td.actions
-              = link_to t('helpers.links.edit'), [:edit, :suppliers, list], class: 'btn btn-mini', data: {t: 'helpers.links.edit'}
-              '
-              = link_to t("helpers.links.destroy"), [:suppliers, list], method: :delete, data: {confirm: are_you_sure? }, class: 'btn btn-mini btn-danger', data: {t: 'helpers.links.destroy'}
+    = paginate @lists
+    = render 'lists_table', lists: @lists
   - else
-    = no_content_given model_class
-javascript:
-  window.datepicker_options['onSelect'] = function(dateText, inst){$('#select-date-form').submit()}
+    = no_content_given List

app/views/suppliers/lists/show.html.slim

@@ -2,6 +2,8 @@
 dl.dl-horizontal
   dt= List.human_attribute_name(:created_at)
   dd= l @list.created_at, format: :short
+  dt= t('supplier.lists.show.users')
+  dd= @list.users.map(&:supplier_name).join(', ')
 .well
   table#list-table.table.list-table
     thead

app/views/suppliers/mailer/confirmation_instructions.html.slim

@@ -1,7 +1,6 @@
-h3 "Welkom bij Qwaiter #{@resource.email}!"
-p
-  | 
-    Je hebt een account aangevraag bij Qwaiter of wil een wijziging doorvoeren waarvoor bevestiging nodig is. Als dit niet de bedoeling is kan je deze email negeren.
-    Om je account te activeren of de aangevraagde wijziging door te voeren moet je op de bevestigingslink hieronder klikken:
+p= t('devise.mailer.confirmation_instructions.supplier.salutation', email: @resource.email)
 
-p= link_to 'Bevestig mijn Qwaiter account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)
+p=raw t \
+  'devise.mailer.confirmation_instructions.supplier.body',
+  unconfirmed_email: @resource.unconfirmed_email,
+  confirm_url: confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)

app/views/suppliers/product_categories/show.html.slim

@@ -4,8 +4,8 @@
 dl.dl-horizontal.show-list
   dt data-t='attributes.product_category.name'= model_class.human_attribute_name(:name)
   dd= @product_category.name
-  dt data-t='attributes.product_category.position'= model_class.human_attribute_name(:position)
-  dd= @product_category.position
+  /dt data-t='attributes.product_category.position'= model_class.human_attribute_name(:position)
+  /dd= @product_category.position
   dt data-t='attributes.product_category.visible_on'= model_class.human_attribute_name(:visible_on)
   dd= @product_category.visible_on
   dt data-t='models.plural.product'= Product.model_name.human_plural

app/views/suppliers/sections/_form.html.slim

@@ -14,7 +14,8 @@
       = f.text_field :height, class: ['text_field', :numeric]
   .form-actions
     = f.submit nil, class: 'btn btn-primary'
-    '
-    = link_to t('supplier.tables.qr_codes.link'), qr_codes_suppliers_tables_path(section_id: @section.id), class: 'btn btn-info', data: {t: 'tables.qr_codes.link'}
+    - unless f.object.new_record?
+      '
+      = link_to t('supplier.tables.qr_codes.link'), qr_codes_suppliers_tables_path(section_id: @section.id), class: 'btn btn-info', data: {t: 'tables.qr_codes.link'}
     '
     = link_to t("helpers.links.cancel"), suppliers_sections_path, class: 'btn'

app/views/suppliers/sections/index.html.slim

@@ -19,7 +19,10 @@
               span.active-table-count= (@active_table_ids & section.tables.map(&:id)).size
             td.numeric= section.width
             td.numeric= section.height
-            td.actions = link_to t("helpers.links.destroy"), [:suppliers, section], method: :delete, data: {confirm: are_you_sure?, t: 'helpers.links.destroy'}, class: 'btn btn-mini btn-danger'
+            td.actions
+              = link_to t('supplier.tables.qr_codes.link'), qr_codes_suppliers_tables_path(section_id: section.id), class: 'btn btn-mini btn-info', data: {t: 'tables.qr_codes.link'}
+              '
+              = link_to t("helpers.links.destroy"), [:suppliers, section], method: :delete, data: {confirm: are_you_sure?, t: 'helpers.links.destroy'}, class: 'btn btn-mini btn-danger'
   - else
     = no_content_given model_class
 .form-actions

app/views/users/mailer/confirmation_instructions.html.erb

@@ -1,5 +0,0 @@
-<p>Welcome <%= @resource.email %>!</p>
-
-<p>You can confirm your account email through the link below:</p>
-
-<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>

app/views/users/mailer/confirmation_instructions.html.slim

@@ -0,0 +1,6 @@
+p= t('devise.mailer.confirmation_instructions.salutation', email: @resource.email)
+
+p=raw t \
+  'devise.mailer.confirmation_instructions.body',
+  unconfirmed_email: @resource.unconfirmed_email,
+  confirm_url: confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)