From 8cecb9a52485a0a4604d61746e5eb89880078280 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 16 Oct 2017 15:29:41 +0630 Subject: [PATCH] update admin bsb --- app/assets/stylesheets/application.scss | 24 ++++++++- .../settings/processing_items/_form.html.erb | 19 +++---- app/views/transactions/orders/index.html.erb | 51 ++++++++++--------- app/views/transactions/orders/show.html.erb | 26 ++++------ app/views/transactions/sales/index.html.erb | 29 +++++------ 5 files changed, 82 insertions(+), 67 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index cb050880..62af91af 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -405,4 +405,26 @@ tr.discount-item-row:hover { -moz-opacity: 1; /* mozilla */ } -/***********************End Origami CSS ************************/ \ No newline at end of file +/***********************End Origami CSS ************************/ + +/*----- Order Processing Items -----*/ +.opi_ul { + display:block; + padding-left:0px; +} +.opi_ul li { + display:list-item; + list-style: none; + margin-top:2px; +} + +.opi_selected { + background-color:#BEA2C2 !important; +} +.opi_default { + cursor: pointer; + background-color: #E8ECF9; + line-height: inherit; + padding:5px; +} +/*----- Order Processing Items -----*/ \ No newline at end of file diff --git a/app/views/settings/processing_items/_form.html.erb b/app/views/settings/processing_items/_form.html.erb index 38c4284d..8230e4e6 100644 --- a/app/views/settings/processing_items/_form.html.erb +++ b/app/views/settings/processing_items/_form.html.erb @@ -18,15 +18,18 @@
-

<%= category.name %> -

+

<%= category.name %>

+ - - +

+
- - diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb index 180c9d5b..30152ae4 100644 --- a/app/views/transactions/orders/index.html.erb +++ b/app/views/transactions/orders/index.html.erb @@ -1,23 +1,23 @@ -
-
-
    -
  1. Home
    2. -
  2. - Order -
    3. - -
-
+ +
+
    +
  1. Home
    2. +
  2. Order
    3. + + <%= link_to 'Back', dashboard_path %> + +
-
-
+
+
<%= form_tag transactions_orders_path, :method => :get do %> -
- +
+
+
-
+ +
+
-
- +
+
-
- +
+ -
+
+
<% end %>
@@ -80,7 +81,7 @@ - - + --> diff --git a/app/views/transactions/orders/show.html.erb b/app/views/transactions/orders/show.html.erb index f55cec28..95f39983 100644 --- a/app/views/transactions/orders/show.html.erb +++ b/app/views/transactions/orders/show.html.erb @@ -1,20 +1,12 @@ -
-
-
    -
  1. Home
    2. -
  2. - Order -
    3. -
  3. - <%= @order.order_id %> -
    4. - - - Back - - -
-
+
+
    +
  1. Home
    2. +
  2. Order
    3. +
  3. Details
    4. + + <%= link_to 'Back', transactions_orders_path %> + +
diff --git a/app/views/transactions/sales/index.html.erb b/app/views/transactions/sales/index.html.erb index 440989cb..c4767553 100644 --- a/app/views/transactions/sales/index.html.erb +++ b/app/views/transactions/sales/index.html.erb @@ -1,15 +1,12 @@ -
-
-
    -
  1. Home
    2. -
  2. - Sale -
    3. - -
-
+
+
    +
  1. Home
    2. +
  2. Sale
    3. + + <%= link_to 'Back', dashboard_path %> + +
-
@@ -19,23 +16,25 @@
<%= form_tag transactions_sales_path, :method => :get do %> -
+
+
-
+
-
+
-
+
+
<% end %>