From dd31ec8d5c9dbdf57ed22447d6cfd4f8a4489283 Mon Sep 17 00:00:00 2001 From: Sneha Priya Ale Date: Sat, 2 Mar 2019 23:41:25 -0800 Subject: [PATCH 1/2] Fix:OrderDetailPage#24 --- OpenShop/BFOrderDetailsTableViewCellExtension.m | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/OpenShop/BFOrderDetailsTableViewCellExtension.m b/OpenShop/BFOrderDetailsTableViewCellExtension.m index 576b9cb..e0e9f9b 100755 --- a/OpenShop/BFOrderDetailsTableViewCellExtension.m +++ b/OpenShop/BFOrderDetailsTableViewCellExtension.m @@ -115,22 +115,23 @@ - (UITableViewCell *)getCellForRowAtIndex:(NSInteger)index { // item value cell.subheaderLabel.text = self.order.clientName ?: @""; break; - case BFOrderDetailsItemDate: + case BFOrderDetailsItemDate:{ // item name cell.headerlabel.text = BFLocalizedString(kTranslationOrderDateCreated, @"Date created"); // item value - cell.subheaderLabel.text = self.order.date ? [NSString stringWithFormat:@"%@", self.order.orderRemoteID] : @""; - break; - case BFOrderDetailsItemTotalPrice: { - // item name - cell.headerlabel.text = BFLocalizedString(kTranslationOrderTotalPrice, @"Total"); - // item value + //cell.subheaderLabel.text = self.order.date ? [NSString stringWithFormat:@"%@", self.order.orderRemoteID] : @""; NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; dateFormatter.dateStyle = NSDateFormatterMediumStyle; dateFormatter.timeStyle = NSDateFormatterNoStyle; cell.subheaderLabel.text = self.order.date ? (NSString *)[dateFormatter stringFromDate:(NSDate *)self.order.date] : @""; break; - } + } + case BFOrderDetailsItemTotalPrice: + // item name + cell.headerlabel.text = BFLocalizedString(kTranslationOrderTotalPrice, @"Total"); + // item value + cell.subheaderLabel.text = self.order.totalPriceFormatted ? [NSString stringWithFormat:@"%@", self.order.totalPriceFormatted] : @""; + break; case BFOrderDetailsItemShippingName: // item name cell.headerlabel.text = BFLocalizedString(kTranslationOrderShippingName, @"Shipping"); From b98486edc8649c5e24158e27283d4dce33f3ddc3 Mon Sep 17 00:00:00 2001 From: Sneha Priya Ale Date: Sat, 2 Mar 2019 23:45:09 -0800 Subject: [PATCH 2/2] Fix:OrderDetailPage#24-RemovedComments --- OpenShop/BFOrderDetailsTableViewCellExtension.m | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenShop/BFOrderDetailsTableViewCellExtension.m b/OpenShop/BFOrderDetailsTableViewCellExtension.m index e0e9f9b..db357d5 100755 --- a/OpenShop/BFOrderDetailsTableViewCellExtension.m +++ b/OpenShop/BFOrderDetailsTableViewCellExtension.m @@ -119,7 +119,6 @@ - (UITableViewCell *)getCellForRowAtIndex:(NSInteger)index { // item name cell.headerlabel.text = BFLocalizedString(kTranslationOrderDateCreated, @"Date created"); // item value - //cell.subheaderLabel.text = self.order.date ? [NSString stringWithFormat:@"%@", self.order.orderRemoteID] : @""; NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; dateFormatter.dateStyle = NSDateFormatterMediumStyle; dateFormatter.timeStyle = NSDateFormatterNoStyle;