From 85a1a3627a73f357da59636f1f8b57bd52752fe3 Mon Sep 17 00:00:00 2001
From: saunmanoj888 <manoj@kiprosh.com>
Date: Thu, 16 Jun 2022 23:28:11 +0530
Subject: [PATCH 1/2] Add translation for order-cycle-status on new order
 creation from admin

---
 app/helpers/order_cycles_helper.rb | 8 ++++----
 config/locales/en.yml              | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/helpers/order_cycles_helper.rb b/app/helpers/order_cycles_helper.rb
index 741613e246..a9f8d9ca6f 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?
-      'undated'
+      I18n.t('admin.order_cycles.status.undated')
     elsif order_cycle.upcoming?
-      'upcoming'
+      I18n.t('admin.order_cycles.status.upcoming')
     elsif order_cycle.open?
-      'open'
+      I18n.t('admin.order_cycles.status.open')
     elsif order_cycle.closed?
-      'closed'
+      I18n.t('admin.order_cycles.status.closed')
     end
   end
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3820f0c536..582d8e87fa 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1226,6 +1226,11 @@ en:
         msg: This order cycle is linked to %{n} open subscription orders. Changing this date now will not affect any orders which have already been placed, but should be avoided if possible. Are you sure you want to proceed?
         cancel: Cancel
         proceed: Proceed
+      status:
+          undated: undated
+          upcoming: upcoming
+          open: open
+          closed: closed
     producer_properties:
       index:
         title: Producer Properties

From 12eff626f4ad4353b536a7f5a2e843a4eb78e911 Mon Sep 17 00:00:00 2001
From: saunmanoj888 <manoj@kiprosh.com>
Date: Thu, 23 Jun 2022 01:33:51 +0530
Subject: [PATCH 2/2] 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