From 619bf7bc3d8c7f102893c68bb915c04909143a28 Mon Sep 17 00:00:00 2001
From: Mahmut Gundogdu <mahmutgundogdu@hotmail.com.tr>
Date: Fri, 18 Mar 2022 17:05:52 +0300
Subject: [PATCH] Get value of OrderStatusEnum at localization

---
 .../order-status/order-status.component.ts    | 33 -------------------
 .../projects/ordering/src/ordering.module.ts  |  7 +---
 .../src/pages/orders/orders.component.html    |  2 +-
 .../src/pages/orders/orders.module.ts         |  2 --
 .../Localization/OrderingService/en.json      |  6 +++-
 5 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 100644 apps/angular/projects/ordering/src/lib/components/order-status/order-status.component.ts

diff --git a/apps/angular/projects/ordering/src/lib/components/order-status/order-status.component.ts b/apps/angular/projects/ordering/src/lib/components/order-status/order-status.component.ts
deleted file mode 100644
index 85194f8a..00000000
--- a/apps/angular/projects/ordering/src/lib/components/order-status/order-status.component.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import {ChangeDetectionStrategy, Component, Input} from '@angular/core';
-import {orderStatusOptions} from '../../proxy/orders';
-
-@Component({
-  selector: 'lib-order-status',
-  template: `
-    {{statusText}}
-  `,
-  changeDetection: ChangeDetectionStrategy.OnPush
-})
-export class OrderStatusComponent {
-
-  @Input()
-  set id(v: number) {
-    this.statusText = this.idToText(v);
-  }
-
-  options = orderStatusOptions;
-
-  statusText: string;
-
-  private idToText(id: number): string | null {
-    console.log('hello', new Date().toLocalISOString())
-    const item = this.options.find(x => x.value === id);
-
-    if (!item) {
-      return null;
-    }
-    return item.key;
-  }
-
-
-}
diff --git a/apps/angular/projects/ordering/src/ordering.module.ts b/apps/angular/projects/ordering/src/ordering.module.ts
index 5d342ad0..75e1eb8b 100644
--- a/apps/angular/projects/ordering/src/ordering.module.ts
+++ b/apps/angular/projects/ordering/src/ordering.module.ts
@@ -1,18 +1,13 @@
 import { NgModule } from '@angular/core';
 import { OrderingRoutingModule } from './ordering-routing.module';
-import { OrderStatusComponent } from './lib/components/order-status/order-status.component';
-
 
 @NgModule({
   declarations: [
-    OrderStatusComponent
   ],
   imports: [
     OrderingRoutingModule
   ],
-    exports: [
-        OrderStatusComponent
-    ]
+    exports: []
 })
 export class OrderingModule {
 }
diff --git a/apps/angular/projects/ordering/src/pages/orders/orders.component.html b/apps/angular/projects/ordering/src/pages/orders/orders.component.html
index 162a7297..cc116521 100644
--- a/apps/angular/projects/ordering/src/pages/orders/orders.component.html
+++ b/apps/angular/projects/ordering/src/pages/orders/orders.component.html
@@ -63,7 +63,7 @@
       </ngx-datatable-column>
       <ngx-datatable-column [name]="'OrderingService::DisplayName:OrderStatus' | abpLocalization" prop="orderStatus">
         <ng-template let-value="value" ngx-datatable-cell-template>
-            <lib-order-status [id]="value"></lib-order-status>
+             {{ "OrderingService::Enum:OrderStatus:" + value | abpLocalization }}
         </ng-template>
       </ngx-datatable-column>
     </ngx-datatable>
diff --git a/apps/angular/projects/ordering/src/pages/orders/orders.module.ts b/apps/angular/projects/ordering/src/pages/orders/orders.module.ts
index 4397bc98..ee7f4aac 100644
--- a/apps/angular/projects/ordering/src/pages/orders/orders.module.ts
+++ b/apps/angular/projects/ordering/src/pages/orders/orders.module.ts
@@ -8,7 +8,6 @@ import { CoreModule } from '@abp/ng.core';
 import { OrderDetailComponent } from './order-detail/order-detail.component';
 import { OrderDetailItemComponent } from './order-detail/order-detail-item/order-detail-item.component';
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
-import {OrderingModule} from "../../ordering.module";
 
 
 @NgModule({
@@ -23,7 +22,6 @@ import {OrderingModule} from "../../ordering.module";
         OrdersRoutingModule,
         ThemeSharedModule,
         CoreModule,
-        OrderingModule,
     ]
 })
 export class OrdersModule { }
diff --git a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/en.json b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/en.json
index c1bbf183..1166f1a6 100644
--- a/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/en.json
+++ b/services/ordering/src/EShopOnAbp.OrderingService.Domain.Shared/Localization/OrderingService/en.json
@@ -32,6 +32,10 @@
     "DisplayName:PaymentMethod": "Payment Method", 
     "DisplayName:Total": "Total", 
     "Permission:Orders.SetAsCancelled": "Set As Cancelled",
-    "Permission:Orders.SetAsShipped": "Set As Shipped"
+    "Permission:Orders.SetAsShipped": "Set As Shipped",
+    "Enum:OrderStatus:0":"Placed",
+    "Enum:OrderStatus:1":"Paid",
+    "Enum:OrderStatus:2":"Shipped",
+    "Enum:OrderStatus:3":"Cancelled"
   }
 }
\ No newline at end of file