From cb33ede9dc18b9ef0be2927bb7ef4cd472cab218 Mon Sep 17 00:00:00 2001 From: Nicolas Blanc Date: Sun, 28 Feb 2016 19:54:44 +0000 Subject: [PATCH] Revert "elf-pavlik@ee52f1d" This reverts commit a8d7732a39661afe7170b9fa4031c719be8a4d80. --- app/views/admin/order_cycles/edit.html.haml | 2 +- app/views/admin/order_cycles/index.html.haml | 10 +++--- .../admin/orders/bulk_management.html.haml | 31 +++++++------------ config/locales/en.yml | 11 ++++--- 4 files changed, 24 insertions(+), 30 deletions(-) diff --git a/app/views/admin/order_cycles/edit.html.haml b/app/views/admin/order_cycles/edit.html.haml index a00935f07d..fe0892c300 100644 --- a/app/views/admin/order_cycles/edit.html.haml +++ b/app/views/admin/order_cycles/edit.html.haml @@ -5,7 +5,7 @@ %h1 - = t :edit_order_cycle + = t:edit_order_cycle - ng_controller = order_cycles_simple_form ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl' diff --git a/app/views/admin/order_cycles/index.html.haml b/app/views/admin/order_cycles/index.html.haml index d0058618a2..d7a6745b19 100644 --- a/app/views/admin/order_cycles/index.html.haml +++ b/app/views/admin/order_cycles/index.html.haml @@ -30,11 +30,11 @@ %tr %th =t :name %th =t :open - %th =t :close + %th =t :close - unless order_cycles_simple_index - %th =t :supplier - %th =t :coordinator - %th =t :distributors + %th =t :supplier + %th =t :coordinator + %th =t :distributors %th =t :products %th.actions %th.actions @@ -44,4 +44,4 @@ = f.fields_for :collection do |order_cycle_form| = render 'admin/order_cycles/row', order_cycle_form: order_cycle_form - = f.submit t :update \ No newline at end of file + = f.submit t :update diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml index 891a9decaf..a63f173662 100644 --- a/app/views/spree/admin/orders/bulk_management.html.haml +++ b/app/views/spree/admin/orders/bulk_management.html.haml @@ -4,7 +4,7 @@ - content_for :page_title do %h1.page-title = t "bulk_order_management" - %a{ 'ofn-with-tip' => "#t('bom_tip')" } + %a{ 'ofn-with-tip' => "Use this page to alter product quantities across multiple orders. Products may also be removed from orders entirely, if required." } What's this? = t "admin_entreprise_groups_what_s_this" %h1.page-title Bulk Order Management @@ -30,7 +30,7 @@ %br %select{ :class => "three columns alpha", :id => 'supplier_filter', 'select2-min-search' => 5, 'ng-model' => 'supplierFilter', 'ng-options' => 's.id as s.name for s in suppliers' } .filter_select{ :class => "three columns" } - %label{ :for => 'distributor_filter' } + %label{ :for => 'distributor_filter' }Hub %br %select{ :class => "three columns alpha", :id => 'distributor_filter', 'select2-min-search' => 5, 'ng-model' => 'distributorFilter', 'ng-options' => 'd.id as d.name for d in distributors'} .filter_select{ :class => "three columns" } @@ -49,7 +49,7 @@ %div.shared_resource{ :class => "four columns alpha" } %span{ :class => 'three columns alpha' } %input{ type: 'checkbox', :id => 'shared_resource', 'ng-model' => 'sharedResource'} - = t "bom_shared" + Shared Resource? %div{ :class => "eight columns" } %h6{ :class => "eight columns alpha", 'ng-show' => 'sharedResource', style: 'text-align: center;' } {{ selectedUnitsProduct.name + ": ALL" }} %h6{ :class => "eight columns alpha", 'ng-hide' => 'sharedResource', style: 'text-align: center;' } {{ selectedUnitsVariant.full_name }} @@ -103,7 +103,7 @@ %div{ :class => "seven columns" }   %div{ :class => "three columns omega" } %div.ofn_drop_down{ 'ng-controller' => "DropDownCtrl", :id => "columns_dropdown", 'ofn-drop-down' => true, :style => 'float:right;' } - %span{ :class => 'icon-reorder' } + %span{ :class => 'icon-reorder' }   Columns %span{ 'ng-class' => "expanded && 'icon-caret-up' || !expanded && 'icon-caret-down'" } %div.menu{ 'ng-show' => "expanded" } %div.menu_item{ :class => "three columns alpha", 'ng-repeat' => "column in columns", 'ofn-toggle-column' => true } @@ -111,12 +111,10 @@ %span{ :class => 'two columns omega' } {{column.name }} %div.sixteen.columns.alpha#loading{ 'ng-if' => 'RequestMonitor.loading' } %img.spinner{ src: "/assets/spinning-circles.svg" } - %h1 - =t "bom_loading" + %h1 LOADING ORDERS %div{ :class => "sixteen columns alpha", 'ng-show' => '!RequestMonitor.loading && filteredLineItems.length == 0'} - %h1#no_results - = t "bom_no_results" + %h1#no_results No orders found. %div{ 'ng-hide' => 'RequestMonitor.loading || filteredLineItems.length == 0' } %form{ name: 'bulk_order_form' } @@ -138,20 +136,15 @@ %a{ :href => '', 'ng-click' => "predicate = 'order.phone'; reverse = !reverse" } = t "phone" %th.date{ 'ng-show' => 'columns.order_date.visible' } - %a{ :href => '', 'ng-click' => "predicate = 'order.completed_at'; reverse = !reverse" } - =t "bom_date" + %a{ :href => '', 'ng-click' => "predicate = 'order.completed_at'; reverse = !reverse" } Order Date %th.producer{ 'ng-show' => 'columns.producer.visible' } - %a{ :href => '', 'ng-click' => "predicate = 'supplier.name'; reverse = !reverse" } - = t "producer" + %a{ :href => '', 'ng-click' => "predicate = 'supplier.name'; reverse = !reverse" } Producer %th.order_cycle{ 'ng-show' => 'columns.order_cycle.visible' } - %a{ :href => '', 'ng-click' => "predicate = 'order.order_cycle.name'; reverse = !reverse" } - = t "bom_cycle" + %a{ :href => '', 'ng-click' => "predicate = 'order.order_cycle.name'; reverse = !reverse" } Order Cycle %th.hub{ 'ng-show' => 'columns.hub.visible' } - %a{ :href => '', 'ng-click' => "predicate = 'order.distributor.name'; reverse = !reverse" } - = t "bom_hub" + %a{ :href => '', 'ng-click' => "predicate = 'order.distributor.name'; reverse = !reverse" } Hub %th.variant{ 'ng-show' => 'columns.variant.visible' } - %a{ :href => '', 'ng-click' => "predicate = 'units_variant.full_name'; reverse = !reverse" } - = t "bom_variant" + %a{ :href => '', 'ng-click' => "predicate = 'units_variant.full_name'; reverse = !reverse" } Product: Unit %th.quantity{ 'ng-show' => 'columns.quantity.visible' } = t "products_quantity" %th.max{ 'ng-show' => 'columns.max.visible' } @@ -162,7 +155,7 @@ = t "products_price" %th.actions %th.actions - = t "ask" + = t("ask")  %input{ :type => 'checkbox', 'ng-model' => "confirmDelete" } %tr.line_item{ 'ng-repeat' => "line_item in filteredLineItems = ( lineItems | filter:quickSearch | selectFilter:supplierFilter:distributorFilter:orderCycleFilter | variantFilter:selectedUnitsProduct:selectedUnitsVariant:sharedResource | orderBy:predicate:reverse )", 'ng-class-even' => "'even'", 'ng-class-odd' => "'odd'", :id => "li_{{line_item.id}}" } diff --git a/config/locales/en.yml b/config/locales/en.yml index 25c3621fe2..c867a29e67 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -245,12 +245,12 @@ en: bom_quantity: "Quantity" bom_max: "Max" bom_hub: "Hub" - bom_variant: "Product: Unit" + bom_variant: "Variant" bom_final_weigth_volume: "Weight/Volume" + bom_price: "Price" bom_actions_delete: "Delete Selected" bom_order_error: "Some errors must be resolved before you can update orders.\nAny fields with red borders contain errors." - bom_loading: "Loading orders" -+ bom_no_results: "No orders found." + unsaved_changes_warning: "Unsaved changes exist and will be lost if you continue." products: "Products" @@ -526,6 +526,7 @@ See the %{link} to find out more about %{sitename}'s features and to start using products_oc_is: "Your order cycle for this order is %{name}." products_oc_error: "Please complete your order from %{link} before shopping in a different order cycle." products_oc_current: "your current order cycle" + products_quantity: Quantity products_max_quantity: Max quantity products_distributor: Distributor products_distributor_info: When you select a distributor for your order, their address and pickup times will be displayed here. @@ -763,7 +764,7 @@ Please follow the instructions there to make your enterprise visible on the Open update_user_invoices: "Update User Invoices" update_user_invoice_explained: "Use this button to immediately update invoices for the month to date for each enterprise user in the system. This task can be set up to run automatically every night." auto_finalise_invoices: "Auto-finalise invoices monthly on the 2nd at 1:30am" - auto_update_invoices: "Auto-update invoices nightly at 1:00am" + auto_update_invoices: "Auto-update invoices nightly at 1:00am" in_progress: "In Progress" started_at: "Started at" queued: "Queued" @@ -840,7 +841,7 @@ Please follow the instructions there to make your enterprise visible on the Open no_orders_found: "No orders found." order_no: "Order No." weight_volume: "Weight/Volume" - remove_tax: "Remove tax" + remove_tax: "Remove tax" tax_settings: "Tax Settings" products_require_tax_category: "products require tax category" admin_shared_address_1: "Address"