diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 89e75d3d..551199f4 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -15,6 +15,10 @@ padding-left: 10px; padding-right: 10px; } +.col-lg-1, .col-md-1, .col-sm-1,col-xl-1{ + padding-left: 5px ; + padding-right: 5px ; +} .navbar { padding: 0.1rem 1rem; @@ -83,16 +87,26 @@ section.content { .card { margin-bottom: 20px; } + .card .card-header { padding: 0.5rem; } + .card .card-title{ margin-bottom:0.5rem; } + .card .card-block { padding: 0.5rem 1rem 1rem; } +.btn { + padding: .46875rem 0.25rem; + color : #fff !important; +} +.btn-default, .bg-default{ + color : #111 !important; +} .checkbox label, label.checkbox-inline { padding-left: 0; } @@ -109,6 +123,7 @@ section.content { opacity: 1; } + .sidebar .menu .list .header { background: #eee; font-size: 12px; @@ -116,6 +131,10 @@ section.content { padding: 8px 16px; } +.breadcrumb { + font-size:0.87rem; +} + /* End Reset Theme */ /* *************************************************** */ diff --git a/app/views/settings/accounts/_form.html.erb b/app/views/settings/accounts/_form.html.erb index b2101a43..7b85dad6 100644 --- a/app/views/settings/accounts/_form.html.erb +++ b/app/views/settings/accounts/_form.html.erb @@ -11,7 +11,7 @@
- <%= f.button :submit %> + <%= f.submit "Create Account",:class => 'btn btn-primary btn-lg waves-effect' %>
<% end %> diff --git a/app/views/settings/accounts/edit.html.erb b/app/views/settings/accounts/edit.html.erb index 9bce15b6..3ac0955e 100644 --- a/app/views/settings/accounts/edit.html.erb +++ b/app/views/settings/accounts/edit.html.erb @@ -1,4 +1,4 @@ -
+ +
+
    +
  1. Home
    2. +
  2. Account
    3. +
  3. Edit
    4. + + <%= link_to 'Back', settings_accounts_path %> + +
+ + <%= render 'form', settings_account: @settings_account %> diff --git a/app/views/settings/accounts/index.html.erb b/app/views/settings/accounts/index.html.erb index 09473b97..d71d7e29 100644 --- a/app/views/settings/accounts/index.html.erb +++ b/app/views/settings/accounts/index.html.erb @@ -1,46 +1,66 @@
- +
    +
  1. Home
    2. +
  2. Account
    3. + + <%= link_to 'Back', dashboard_path %> + +
+
+
+ <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_account_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>

-
- - - - - - - - - +
+
+
+
TitleAccount TypeDiscountPointBonusRebate
+ + + + + + + + - - - + + + - - <% @settings_accounts.each do |account| %> - - - - - - - - + <% @settings_accounts.each do |account| %> + + + + + + + + - - <% end %> - -
TitleAccount TypeDiscountPointBonusRebateAction
Action
<%= account.title %><%= %><%= account.account_type == 1 ? "Expense" : "Income"%><%= account.discount %><%= account.point %><%= account.bonus %><%= account.rebate %> - <%= link_to 'Edit', edit_settings_account_path(account) %> | - <%= link_to 'Destroy', settings_account_path(account), method: :delete, data: { confirm: 'Are you sure?' } %> +
<%= account.title %><%= %><%= account.account_type == 1 ? "Expense" : "Income"%><%= account.discount %><%= account.point %><%= account.bonus %><%= account.rebate %> + <%= link_to 'Edit', edit_settings_account_path(account),:class => 'btn btn-primary btn-lg waves-effect' %> + <%= link_to 'Destroy', settings_account_path(account),:class => 'btn btn-danger btn-lg waves-effect', method: :delete, data: { confirm: 'Are you sure?' } %> -
+ + + <% end %> + + +
+
+
+
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse + cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non + proident, sunt in culpa qui officia deserunt mollit anim id est laborum. +
+
+
+ diff --git a/app/views/settings/accounts/new.html.erb b/app/views/settings/accounts/new.html.erb index a36a69b5..ac1d1c33 100644 --- a/app/views/settings/accounts/new.html.erb +++ b/app/views/settings/accounts/new.html.erb @@ -1,11 +1,12 @@ -
-
- -
- <%= render 'form', settings_account: @settings_account %> +
+
    +
  1. Home
    2. +
  2. Account
    3. +
  3. New
    4. + + <%= link_to 'Back', settings_accounts_path %> + +
+ <%= render 'form', settings_account: @settings_account %> \ No newline at end of file diff --git a/app/views/settings/accounts/show.html.erb b/app/views/settings/accounts/show.html.erb index 6d28df26..0701e585 100644 --- a/app/views/settings/accounts/show.html.erb +++ b/app/views/settings/accounts/show.html.erb @@ -34,7 +34,7 @@ <%= @settings_account.rebate %> - <%= link_to 'Edit', edit_settings_account_path(@settings_account, @settings_account) %> + <%= link_to 'Edit', edit_settings_account_path(@settings_account, @settings_account),:class => 'btn btn-primary btn-lg waves-effect' %> diff --git a/app/views/settings/cashier_terminals/_form.html.erb b/app/views/settings/cashier_terminals/_form.html.erb index ee8a4d27..95f21f07 100644 --- a/app/views/settings/cashier_terminals/_form.html.erb +++ b/app/views/settings/cashier_terminals/_form.html.erb @@ -1,20 +1,34 @@ -<%= simple_form_for([:settings, @settings_cashier_terminal]) do |f| %> - <%= f.error_notification %> +
+
+ <%= simple_form_for([:settings, @settings_cashier_terminal]) do |f| %> + <%= f.error_notification %> -
- <%= f.input :name %> - <%= f.input :is_active %> - <%= f.input :is_currently_login %> - <%= f.input :auto_print_receipt %> - <%= f.input :printer_name %> - <%= f.input :font %> - <%= f.input :font_size %> - <%= f.input :show_tax %> - <%= f.input :show_cashier %> - <%= f.input :show_guest_info %> -
+
+ <%= f.input :name %> + <%= f.input :is_active %> + <%= f.input :is_currently_login %> + <%= f.input :auto_print_receipt %> + <%= f.input :printer_name %> + <%= f.input :font %> + <%= f.input :font_size %> + <%= f.input :show_tax %> + <%= f.input :show_cashier %> + <%= f.input :show_guest_info %> +
-
- <%= f.button :submit %> +
+ <%= f.submit "Create Cashier Terminal",:class => 'btn btn-primary btn-lg waves-effect' %> +
+ <% end %>
-<% end %> +
+
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +
+
+
+
diff --git a/app/views/settings/cashier_terminals/edit.html.erb b/app/views/settings/cashier_terminals/edit.html.erb index 9329c205..a76af8e2 100644 --- a/app/views/settings/cashier_terminals/edit.html.erb +++ b/app/views/settings/cashier_terminals/edit.html.erb @@ -1,11 +1,11 @@ - -
-
- -
- <%= render 'form', settings_cashier_terminal: @settings_cashier_terminal %> +
+
    +
  1. Home
    2. +
  2. Terminals
    3. +
  3. Edit
    4. + + <%= link_to 'Back', settings_cashier_terminals_path %> + +
+<%= render 'form', settings_cashier_terminal: @settings_cashier_terminal %> \ No newline at end of file diff --git a/app/views/settings/cashier_terminals/index.html.erb b/app/views/settings/cashier_terminals/index.html.erb index 25e5e8e7..2b77f169 100644 --- a/app/views/settings/cashier_terminals/index.html.erb +++ b/app/views/settings/cashier_terminals/index.html.erb @@ -1,44 +1,62 @@ -
-
    -
  • Home
    • -
  • Cashier Terminal
    • - - <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_cashier_terminal_path,:class => 'btn btn-primary btn-sm' %> - -
+
    +
  1. Home
    2. +
  2. Cashier Terminal
    3. + + <%= link_to 'Back', dashboard_path %> + +
+
+
+
+ <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_cashier_terminal_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
-
- - - - - - - - - - - - - - - - <% @settings_cashier_terminals.each do |settings_cashier_terminal| %> +
+
+
+
NameActiveLogin?Auto printPrinter nameShow taxShow cashierShow guest infoAction
+ - - - - - - - - - + + + + + + + + + - <% end %> - -
<%= settings_cashier_terminal.name %><%= settings_cashier_terminal.is_active %><%= settings_cashier_terminal.is_currently_login %><%= settings_cashier_terminal.auto_print_receipt %><%= settings_cashier_terminal.printer_name %><%= settings_cashier_terminal.show_tax %><%= settings_cashier_terminal.show_cashier %><%= settings_cashier_terminal.show_guest_info %><%= link_to 'Edit', edit_settings_cashier_terminal_path(settings_cashier_terminal) %> - | <%= link_to 'Destroy', settings_cashier_terminal_path(settings_cashier_terminal), method: :delete, data: { confirm: 'Are you sure?' } %>NameActiveLogin?Auto printPrinter nameShow taxShow cashierShow guest infoAction
-
+ + + + <% @settings_cashier_terminals.each do |settings_cashier_terminal| %> + + <%= settings_cashier_terminal.name %> + <%= settings_cashier_terminal.is_active %> + <%= settings_cashier_terminal.is_currently_login %> + <%= settings_cashier_terminal.auto_print_receipt %> + <%= settings_cashier_terminal.printer_name %> + <%= settings_cashier_terminal.show_tax %> + <%= settings_cashier_terminal.show_cashier %> + <%= settings_cashier_terminal.show_guest_info %> + <%= link_to 'Edit', edit_settings_cashier_terminal_path(settings_cashier_terminal),:class => 'btn btn-info btn-lg waves-effect' %> + <%= link_to 'Destroy', settings_cashier_terminal_path(settings_cashier_terminal), method: :delete, data: { confirm: 'Are you sure?' },:class => 'btn btn-danger btn-lg waves-effect' %> + + <% end %> + + +
+
+
+
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse +
+
+
+
\ No newline at end of file diff --git a/app/views/settings/cashier_terminals/new.html.erb b/app/views/settings/cashier_terminals/new.html.erb index 9ba176f4..7a0945e4 100644 --- a/app/views/settings/cashier_terminals/new.html.erb +++ b/app/views/settings/cashier_terminals/new.html.erb @@ -1,11 +1,11 @@ - -
-
- -
- <%= render 'form', settings_cashier_terminal: @settings_cashier_terminal %> +
+
    +
  1. Home
    2. +
  2. Cashier Terminals
    3. +
  3. New
    4. + + <%= link_to 'Back', settings_cashier_terminals_path %> + +
+<%= render 'form', settings_cashier_terminal: @settings_cashier_terminal %> diff --git a/app/views/settings/commissioners/_form.html.erb b/app/views/settings/commissioners/_form.html.erb index e2d9d120..03be91b7 100644 --- a/app/views/settings/commissioners/_form.html.erb +++ b/app/views/settings/commissioners/_form.html.erb @@ -1,30 +1,43 @@ -
- <%= simple_form_for([:settings, @commissioner]) do |f| %> - <%= f.error_notification %> -
- <%= f.input :name %> - <%= f.label :emp_id, 'Employee' %> - <%= f.collection_select :emp_id, Employee.all.order('name asc'), :id, :name, {prompt: 'Select an Employee'}, {class: "form-control"} %> -
- <%= f.label :commission_id, 'Commission' %>
- <%= f.select :commission_id, Commission.all.map {|l| [l.menu_item.name, l.id]}, {prompt: 'Select a Product'}, {class: 'form-control'} %> -
- <%= f.label :joined_date %>
- <%= f.text_field :joined_date, {class: 'form-control', id: 'joined_date', readonly: true} %>
- <%= f.label :resigned_date %>
- <%= f.text_field :resigned_date, {class: 'form-control', id: 'resigned_date', readonly: true} %>
- -
-
+
+
+
+ <%= simple_form_for([:settings, @commissioner]) do |f| %> + <%= f.error_notification %> -
- <%= link_to 'Back', settings_commissioners_path, class: 'btn btn-success' %> - <%= f.button :submit, class: 'btn btn-info' %> +
+ <%= f.input :name %> + <%= f.label :emp_id, 'Employee' %> + <%= f.collection_select :emp_id, Employee.all.order('name asc'), :id, :name, {prompt: 'Select an Employee'}, {class: "form-control"} %> +
+ <%= f.label :commission_id, 'Commission' %>
+ <%= f.select :commission_id, Commission.all.map {|l| [l.menu_item.name, l.id]}, {prompt: 'Select a Product'}, {class: 'form-control'} %> +
+ <%= f.label :joined_date %>
+ <%= f.text_field :joined_date, {class: 'form-control datepicker', id: 'joined_date', readonly: true} %>
+ <%= f.label :resigned_date %>
+ <%= f.text_field :resigned_date, {class: 'form-control datepicker', id: 'resigned_date', readonly: true} %>
+ +
+
+ +
+ <%= f.submit "Submit",:class => 'btn btn-primary btn-lg waves-effect' %> +
+ <% end %> +
+
+
+
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod + tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, + quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo + consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
- <% end %> +
+
-