End of day commit

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

@@ -3,4 +3,5 @@ p= t('devise.mailer.confirmation_instructions.supplier.salutation', email: @reso
 p=raw t \
   'devise.mailer.confirmation_instructions.supplier.body',
   unconfirmed_email: @resource.unconfirmed_email,
-  confirm_url: confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)
+  confirm_url: confirmation_url(@resource, confirmation_token: @token)
+p Boe

app/views/new_suppliers/new.html.slim

@@ -0,0 +1,28 @@
+.row
+  .large-7.large-offset-1.columns
+    = form_for @new_supplier do |f|
+      = f.row :supplier_name
+        .large-4.columns= f.label :supplier_name
+        .large-4.columns= f.text_field :supplier_name
+        .large-4.columns= f.error_message :supplier_name
+      = f.row :email
+        .large-4.columns= f.label :email
+        .large-4.columns
+          - if @new_supplier.current_employee.present?
+            = @new_supplier.current_employee.email
+          - else
+            = f.email_field :email
+        .large-4.columns= f.error_message :email
+      - if not @new_supplier.current_employee.present?
+        = f.row :password
+          .large-4.columns= f.label :password
+          .large-4.columns= f.text_field :password
+          .large-4.columns= f.error_message :password
+        = f.row :password_confirmation
+          .large-4.columns= f.label :password_confirmation
+          .large-4.columns= f.text_field :password_confirmation
+          .large-4.columns= f.error_message :password_confirmation
+
+      .form-actions
+        = f.submit class: 'button'
+

app/views/suppliers/application/_head.html.erb

@@ -1,7 +1,9 @@
 <script>
 //var $locale = '<%= I18n.locale %>';
 //var supplier_id = '<%= current_supplier.id %>';
-var supplier_object=<%= SupplierSupplierSerializer.new(current_supplier).as_json(root: false).to_json.html_safe %>;
+var supplier_object=<%= {id: current_supplier.id}.to_json.html_safe %>;
+var employee_object=<%=raw current_employee.attributes.slice(:name, :email).merge(id: current_employee.id).to_json %>;
+var employee_settings=<%= raw employee_settings.to_json %>;
 var data_host = '';
 var event_host = '<%= Qwaiter.event_host %>';
 //var datepicker_options = {dateFormat: 'yy-mm-dd', firstDay: <%= current_supplier.week_starts_on_monday? ? 1 : 0 %>};

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

@@ -3,4 +3,4 @@ p= t('devise.mailer.confirmation_instructions.salutation', email: @resource.emai
 p=raw t \
   'devise.mailer.confirmation_instructions.body',
   unconfirmed_email: @resource.unconfirmed_email,
-  confirm_url: confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)
+  confirm_url: confirmation_url(@resource, :confirmation_token => @token)