us1zcljz
/
eShopOnAbp
forked from tsai/eShopOnAbp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

remove abpLocalization from order-detail and add order-detail-item

skoc10/publish-charts-artifacthub
Mahmut Gundogdu 5 years ago
parent
749cad9418
commit
b0f06531d8
2 changed files with 17 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      apps/angular/projects/ordering/src/pages/orders/order-detail/order-detail-item/order-detail-item.component.ts
  2. 32
      apps/angular/projects/ordering/src/pages/orders/order-detail/order-detail.component.html

2
apps/angular/projects/ordering/src/pages/orders/order-detail/order-detail-item/order-detail-item.component.ts
View File

@ -5,7 +5,7 @@ import { Component, Input } from '@angular/core';
template: `
<div class="row">
<div class="col-3">
{{ label }}
{{ label | abpLocalization }}
</div>
<b class="col-9">
<ng-content></ng-content>

32
apps/angular/projects/ordering/src/pages/orders/order-detail/order-detail.component.html
View File

@ -1,18 +1,18 @@
<abp-modal [visible]='visible' (visibleChange)='visibleChange.emit($event)' [options]='modalOption'>
<ng-template #abpHeader>
<h3>{{"OrderingService::ModalTitle" | abpLocalization }}</h3>
<h3>{{"OrderingService::ModalTitle" }}</h3>
</ng-template>
<ng-template #abpBody>
<div *ngIf='order'>
<div class='container'>
<lib-order-detail-item [label]="'OrderingService::DisplayName:OrderNo' | abpLocalization">#{{order.orderNo}}</lib-order-detail-item>
<lib-order-detail-item [label]="'OrderingService::DisplayName:OrderStatus' | abpLocalization">{{order.orderStatus}}</lib-order-detail-item>
<lib-order-detail-item [label]="'OrderingService::DisplayName:BuyerName' | abpLocalization">{{order.buyer.name}}</lib-order-detail-item>
<lib-order-detail-item [label]="'OrderingService::DisplayName:BuyerEmail' | abpLocalization">{{order.buyer.email}}</lib-order-detail-item>
<lib-order-detail-item label="OrderingService::DisplayName:OrderNo">#{{order.orderNo}}</lib-order-detail-item>
<lib-order-detail-item label="OrderingService::DisplayName:OrderStatus">{{order.orderStatus}}</lib-order-detail-item>
<lib-order-detail-item label="OrderingService::DisplayName:BuyerName">{{order.buyer.name}}</lib-order-detail-item>
<lib-order-detail-item label="OrderingService::DisplayName:BuyerEmail">{{order.buyer.email}}</lib-order-detail-item>
<lib-order-detail-item [label]="'OrderingService::DisplayName:Address' | abpLocalization">
<lib-order-detail-item label="OrderingService::DisplayName:Address">
<span *ngIf='order.address as address'>
{{address.description}} <br />
{{address.street}} <br />
@ -20,33 +20,33 @@
{{address.city}} / {{address.country}} <br />
</span>
</lib-order-detail-item>
<lib-order-detail-item [label]="'OrderingService::DisplayName:PaymentMethod' | abpLocalization">{{order.paymentMethod}}</lib-order-detail-item>
<lib-order-detail-item [label]="'OrderingService::DisplayName:Total' | abpLocalization">{{order.orderTotal | currency}}</lib-order-detail-item>
<lib-order-detail-item label="OrderingService::DisplayName:PaymentMethod">{{order.paymentMethod}}</lib-order-detail-item>
<lib-order-detail-item label="OrderingService::DisplayName:Total">{{order.orderTotal | currency}}</lib-order-detail-item>
</div>
<br><br><br>
<ngx-datatable [rows]='(order.items)' default>
<!-- TODO: localize column headers -->
<ngx-datatable-column [name]="'OrderingService::DisplayName:ProductId' | abpLocalization" prop='productId'></ngx-datatable-column>
<ngx-datatable-column [name]="'OrderingService::DisplayName:PictureUrl' | abpLocalization" prop='pictureUrl'>
<ngx-datatable-column [name]="'OrderingService::DisplayName:ProductId'" prop='productId'></ngx-datatable-column>
<ngx-datatable-column [name]="'OrderingService::DisplayName:PictureUrl'" prop='pictureUrl'>
<ng-template let-value='value' ngx-datatable-cell-template>
<img [src]="mediaServerUrl + '/product-images/' + value" width='80' alt='' />
</ng-template>
</ngx-datatable-column>
<ngx-datatable-column [name]="'OrderingService::DisplayName:ProductName' | abpLocalization" prop='productName'></ngx-datatable-column>
<ngx-datatable-column [name]="'OrderingService::DisplayName:UnitPrice' | abpLocalization" prop='unitPrice'>
<ngx-datatable-column [name]="'OrderingService::DisplayName:ProductName'" prop='productName'></ngx-datatable-column>
<ngx-datatable-column [name]="'OrderingService::DisplayName:UnitPrice'" prop='unitPrice'>
<ng-template let-value='value' ngx-datatable-cell-template>
{{value | currency }}
</ng-template>
</ngx-datatable-column>
<ngx-datatable-column [name]="'OrderingService::DisplayName:Units' | abpLocalization" prop='units'></ngx-datatable-column>
<ngx-datatable-column [name]="'OrderingService::DisplayName:Discount' | abpLocalization" prop='discount'>
<ngx-datatable-column [name]="'OrderingService::DisplayName:Units'" prop='units'></ngx-datatable-column>
<ngx-datatable-column [name]="'OrderingService::DisplayName:Discount'" prop='discount'>
<ng-template let-value='value' ngx-datatable-cell-template>
{{value }} %
</ng-template>
</ngx-datatable-column>
<ngx-datatable-column [name]="'OrderingService::DisplayName:TotalPrice' | abpLocalization">
<ngx-datatable-column [name]="'OrderingService::DisplayName:TotalPrice'">
<ng-template let-row='row' ngx-datatable-cell-template>
{{(row.units * row.unitPrice) | currency }}
</ng-template>
@ -60,7 +60,7 @@
<ng-template #abpFooter>
<button type='button' class='btn btn-secondary' abpClose>{{
'AbpUi::Close' | abpLocalization
'AbpUi::Close'
}}</button>
</ng-template>
</abp-modal>

Write Preview
Loading…
Cancel
Save