From 12eff626f4ad4353b536a7f5a2e843a4eb78e911 Mon Sep 17 00:00:00 2001 From: saunmanoj888 Date: Thu, 23 Jun 2022 01:33:51 +0530 Subject: [PATCH] Add translation for statuses in order_controller.js.coffee --- .../admin/orders/controllers/order_controller.js.coffee | 2 +- app/helpers/order_cycles_helper.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee b/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee index 822e81eb49..6107ad2345 100644 --- a/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee +++ b/app/assets/javascripts/admin/orders/controllers/order_controller.js.coffee @@ -20,7 +20,7 @@ angular.module("admin.orders").controller "orderCtrl", ($scope, shops, orderCycl $scope.distributor_id && $scope.order_cycle_id for oc in $scope.orderCycles - oc.name_and_status = "#{oc.name} (#{oc.status})" + oc.name_and_status = "#{oc.name} (#{t("admin.order_cycles.status.#{oc.status}")})" for shop in $scope.shops shop.disabled = !$scope.distributorHasOrderCycles(shop) diff --git a/app/helpers/order_cycles_helper.rb b/app/helpers/order_cycles_helper.rb index a9f8d9ca6f..741613e246 100644 --- a/app/helpers/order_cycles_helper.rb +++ b/app/helpers/order_cycles_helper.rb @@ -38,13 +38,13 @@ module OrderCyclesHelper def order_cycle_status_class(order_cycle) if order_cycle.undated? - I18n.t('admin.order_cycles.status.undated') + 'undated' elsif order_cycle.upcoming? - I18n.t('admin.order_cycles.status.upcoming') + 'upcoming' elsif order_cycle.open? - I18n.t('admin.order_cycles.status.open') + 'open' elsif order_cycle.closed? - I18n.t('admin.order_cycles.status.closed') + 'closed' end end