Change all default/example/test currency codes from `CNY` to `USD`

Resolve #176
4 years ago · d3ab895922
16 changed files with 38 additions and 38 deletions
--- a/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/NewOrderGenerator.cs
+++ b/modules/EasyAbp.EShop.Orders/src/EasyAbp.EShop.Orders.Application/EasyAbp/EShop/Orders/Orders/NewOrderGenerator.cs
@ -174,7 +174,7 @@ namespace EasyAbp.EShop.Orders.Orders
        protected virtual Task<string> GetStoreCurrencyAsync(Guid storeId)
        {
            // Todo: Get real store currency configuration.
-            return Task.FromResult("CNY");
+            return Task.FromResult("USD");
        }
    }
 }
--- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/OrderAppServiceTests.cs
+++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Application.Tests/Orders/OrderAppServiceTests.cs
@ -53,7 +53,7 @@ namespace EasyAbp.EShop.Orders.Orders
                        OrderMaxQuantity = 100,
                        AttributeOptionIds = new List<Guid>(),
                        Price = 1m,
-                        Currency = "CNY",
+                        Currency = "USD",
                        ProductDetailId = null
                    },
                    new ProductSkuDto
@ -64,7 +64,7 @@ namespace EasyAbp.EShop.Orders.Orders
                        OrderMaxQuantity = 100,
                        AttributeOptionIds = new List<Guid>(),
                        Price = 2m,
-                        Currency = "CNY",
+                        Currency = "USD",
                        ProductDetailId = OrderTestData.ProductDetail2Id
                    },
                    new ProductSkuDto
@ -75,7 +75,7 @@ namespace EasyAbp.EShop.Orders.Orders
                        OrderMaxQuantity = 100,
                        AttributeOptionIds = new List<Guid>(),
                        Price = 3m,
-                        Currency = "CNY",
+                        Currency = "USD",
                        ProductDetailId = OrderTestData.ProductDetail2Id
                    }
                },
@ -151,7 +151,7 @@ namespace EasyAbp.EShop.Orders.Orders
                context.Orders.Count().ShouldBe(1);
                var order = context.Orders.Include(x => x.OrderLines).First();
                order.ShouldNotBeNull();
-                order.Currency.ShouldBe("CNY");
+                order.Currency.ShouldBe("USD");
                order.CanceledTime.ShouldBeNull();
                order.CancellationReason.ShouldBeNullOrEmpty();
                order.CompletionTime.ShouldBeNull();
@ -185,7 +185,7 @@ namespace EasyAbp.EShop.Orders.Orders
                orderLine1.TotalPrice.ShouldBe(10m);
                orderLine1.TotalDiscount.ShouldBe(0m);
                orderLine1.ActualTotalPrice.ShouldBe(10m);
-                orderLine1.Currency.ShouldBe("CNY");
+                orderLine1.Currency.ShouldBe("USD");
                orderLine1.Quantity.ShouldBe(10);
                orderLine1.ProductModificationTime.ShouldBe(OrderTestData.ProductLastModificationTime);
                orderLine1.ProductDetailModificationTime.ShouldBe(OrderTestData.ProductDetailLastModificationTime);
--- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Domain.Tests/Orders/InventoryReductionResultTests.cs
+++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Domain.Tests/Orders/InventoryReductionResultTests.cs
@ -20,7 +20,7 @@ public class InventoryReductionResultTests : OrdersDomainTestBase
            null,
            OrderTestData.Store1Id,
            Guid.NewGuid(),
-            "CNY",
+            "USD",
            1m,
            0m,
            1.5m,
@ -41,7 +41,7 @@ public class InventoryReductionResultTests : OrdersDomainTestBase
            null,
            null,
            null,
-            "CNY",
+            "USD",
            0.5m,
            1m,
            0m,
--- a/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Domain.Tests/Orders/OrderDomainTests.cs
+++ b/modules/EasyAbp.EShop.Orders/test/EasyAbp.EShop.Orders.Domain.Tests/Orders/OrderDomainTests.cs
@ -28,7 +28,7 @@ namespace EasyAbp.EShop.Orders.Orders
                null,
                OrderTestData.Store1Id,
                Guid.NewGuid(),
-                "CNY",
+                "USD",
                1m,
                0m,
                1.5m,
@ -49,7 +49,7 @@ namespace EasyAbp.EShop.Orders.Orders
                null,
                null,
                null,
-                "CNY",
+                "USD",
                0.5m,
                1m,
                0m,
@ -82,7 +82,7 @@ namespace EasyAbp.EShop.Orders.Orders
                    Id = Guid.NewGuid(),
                    TenantId = null,
                    PaymentId = OrderTestData.Payment1Id,
-                    Currency = "CNY",
+                    Currency = "USD",
                    RefundAmount = 0.3m,
                    RefundItems = new List<EShopRefundItemEto>
                    {
@ -140,7 +140,7 @@ namespace EasyAbp.EShop.Orders.Orders
                        Id = Guid.NewGuid(),
                        TenantId = null,
                        PaymentId = OrderTestData.Payment1Id,
-                        Currency = "CNY",
+                        Currency = "USD",
                        RefundAmount = -1m,
                        RefundItems = new List<EShopRefundItemEto>
                        {
@ -181,7 +181,7 @@ namespace EasyAbp.EShop.Orders.Orders
                        Id = Guid.NewGuid(),
                        TenantId = null,
                        PaymentId = OrderTestData.Payment1Id,
-                        Currency = "CNY",
+                        Currency = "USD",
                        RefundAmount = 0.3m,
                        RefundItems = new List<EShopRefundItemEto>
                        {
--- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/Payments/PaymentAppServiceTests.cs
+++ b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/Payments/PaymentAppServiceTests.cs
@ -27,7 +27,7 @@ namespace EasyAbp.EShop.Payments.Payments
            orderService.GetAsync(PaymentsTestData.Order1).Returns(Task.FromResult(new OrderDto
            {
                Id = PaymentsTestData.Order1,
-                Currency = "CNY",
+                Currency = "USD",
                ActualTotalPrice = 0,
                StoreId = PaymentsTestData.Store1,
                OrderLines = new List<OrderLineDto>
@ -35,7 +35,7 @@ namespace EasyAbp.EShop.Payments.Payments
                    new OrderLineDto
                    {
                        Id = PaymentsTestData.OrderLine1,
-                        Currency = "CNY",
+                        Currency = "USD",
                        ActualTotalPrice = 0,
                        Quantity = 1
                    }
--- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/Refunds/RefundAppServiceTests.cs
+++ b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Application.Tests/Refunds/RefundAppServiceTests.cs
@ -53,7 +53,7 @@ namespace EasyAbp.EShop.Payments.Refunds
                var payment = Activator.CreateInstance(paymentType, true) as Payment;
                payment.ShouldNotBeNull();
                paymentType.GetProperty(nameof(Payment.Id))?.SetValue(payment, PaymentsTestData.Payment1);
-                paymentType.GetProperty(nameof(Payment.Currency))?.SetValue(payment, "CNY");
+                paymentType.GetProperty(nameof(Payment.Currency))?.SetValue(payment, "USD");
                paymentType.GetProperty(nameof(Payment.ActualPaymentAmount))?.SetValue(payment, 1m);
                paymentType.GetProperty(nameof(Payment.PaymentItems))?.SetValue(payment, new List<PaymentItem> {paymentItem});

@ -83,7 +83,7 @@ namespace EasyAbp.EShop.Payments.Refunds
                var payment = Activator.CreateInstance(paymentType, true) as Payment;
                payment.ShouldNotBeNull();
                paymentType.GetProperty(nameof(Payment.Id))?.SetValue(payment, PaymentsTestData.Payment1);
-                paymentType.GetProperty(nameof(Payment.Currency))?.SetValue(payment, "CNY");
+                paymentType.GetProperty(nameof(Payment.Currency))?.SetValue(payment, "USD");
                paymentType.GetProperty(nameof(Payment.ActualPaymentAmount))?.SetValue(payment, 1m);
                // pending refund amount
                paymentType.GetProperty(nameof(Payment.PendingRefundAmount))?.SetValue(payment, 1m);
@ -108,7 +108,7 @@ namespace EasyAbp.EShop.Payments.Refunds
            orderService.GetAsync(PaymentsTestData.Order1).Returns(Task.FromResult(new OrderDto
            {
                Id = PaymentsTestData.Order1,
-                Currency = "CNY",
+                Currency = "USD",
                ActualTotalPrice = 0,
                StoreId = PaymentsTestData.Store1,
                OrderLines = new List<OrderLineDto>
@ -116,7 +116,7 @@ namespace EasyAbp.EShop.Payments.Refunds
                    new()
                    {
                        Id = PaymentsTestData.OrderLine1,
-                        Currency = "CNY",
+                        Currency = "USD",
                        ActualTotalPrice = 1m,
                        Quantity = 1
                    }
@ -476,7 +476,7 @@ namespace EasyAbp.EShop.Payments.Refunds
                PaymentId = PaymentsTestData.Payment1,
                RefundPaymentMethod = null,
                ExternalTradingCode = "testcode",
-                Currency = "CNY",
+                Currency = "USD",
                RefundAmount = 1.5m,
                DisplayReason = "DisplayReason",
                CustomerRemark = "CustomerRemark",
@ -490,7 +490,7 @@ namespace EasyAbp.EShop.Payments.Refunds
            
            refundDto.PaymentId.ShouldBe(PaymentsTestData.Payment1);
            refundDto.ExternalTradingCode.ShouldBe("testcode");
-            refundDto.Currency.ShouldBe("CNY");
+            refundDto.Currency.ShouldBe("USD");
            refundDto.RefundAmount.ShouldBe(1.5m);
            refundDto.DisplayReason.ShouldBe("DisplayReason");
            refundDto.CustomerRemark.ShouldBe("CustomerRemark");
--- a/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/Refunds/RefundOrderEventHandlerTests.cs
+++ b/modules/EasyAbp.EShop.Payments/test/EasyAbp.EShop.Payments.Domain.Tests/Refunds/RefundOrderEventHandlerTests.cs
@ -49,7 +49,7 @@ public class RefundOrderEventHandlerTests : PaymentsDomainTestBase
            var payment = Activator.CreateInstance(paymentType, true) as Payment;
            payment.ShouldNotBeNull();
            paymentType.GetProperty(nameof(Payment.Id))?.SetValue(payment, PaymentsTestData.Payment1);
-            paymentType.GetProperty(nameof(Payment.Currency))?.SetValue(payment, "CNY");
+            paymentType.GetProperty(nameof(Payment.Currency))?.SetValue(payment, "USD");
            paymentType.GetProperty(nameof(Payment.ActualPaymentAmount))?.SetValue(payment, 1m);
            paymentType.GetProperty(nameof(Payment.PaymentItems))
                ?.SetValue(payment, new List<PaymentItem> { paymentItem });
--- a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Application.Tests/Products/ProductAppServiceTests.cs
+++ b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Application.Tests/Products/ProductAppServiceTests.cs
@ -105,7 +105,7 @@ namespace EasyAbp.EShop.Products.Products
            var response = await _productAppService.CreateSkuAsync(productId, new CreateProductSkuDto
            {
                AttributeOptionIds = new List<Guid> {productAttributeOptionId},
-                Currency = "CNY",
+                Currency = "USD",
                Price = 1m,
                OrderMinQuantity = 1,
                OrderMaxQuantity = 10
@ -117,7 +117,7 @@ namespace EasyAbp.EShop.Products.Products
            response.ProductSkus.Count.ShouldBe(1);

            var responseSku = response.ProductSkus.First();
-            responseSku.Currency.ShouldBe("CNY");
+            responseSku.Currency.ShouldBe("USD");
            responseSku.Price.ShouldBe(1m);
            responseSku.AttributeOptionIds.Count.ShouldBe(1);
            responseSku.AttributeOptionIds.First().ShouldBe(productAttributeOptionId);
@ -202,7 +202,7 @@ namespace EasyAbp.EShop.Products.Products
                    AttributeOptionIds = new List<Guid>
                        { ProductsTestData.Product1Attribute1Option4Id, ProductsTestData.Product1Attribute2Option1Id },
                    ProductDetailId = wrongProductDetailId,
-                    Currency = "CNY",
+                    Currency = "USD",
                    Price = 10m,
                    OrderMinQuantity = 1,
                    OrderMaxQuantity = 10
--- a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Domain.Tests/Products/ProductDomainTests.cs
+++ b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.Domain.Tests/Products/ProductDomainTests.cs
@ -197,7 +197,7 @@ namespace EasyAbp.EShop.Products.Products
        private async Task<ProductSku> CreateTestSkuAsync(IEnumerable<Guid> attributeOptionIds)
        {
            return new ProductSku(Guid.NewGuid(), await AttributeOptionIdsSerializer.SerializeAsync(attributeOptionIds),
-                "test-sku", "CNY", null, 0m, 1, 10, null, null, null);
+                "test-sku", "USD", null, 0m, 1, 10, null, null, null);
        }
    }
 }
--- a/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/ProductsTestDataBuilder.cs
+++ b/modules/EasyAbp.EShop.Products/test/EasyAbp.EShop.Products.TestBase/ProductsTestDataBuilder.cs
@ -72,17 +72,17 @@ namespace EasyAbp.EShop.Products
            var productSku1 = new ProductSku(ProductsTestData.Product1Sku1Id,
                await _attributeOptionIdsSerializer.SerializeAsync(new[]
                    { ProductsTestData.Product1Attribute1Option1Id, ProductsTestData.Product1Attribute2Option1Id }),
-                null, "CNY", null, 1m, 1, 10, null, null, null);
+                null, "USD", null, 1m, 1, 10, null, null, null);

            var productSku2 = new ProductSku(ProductsTestData.Product1Sku2Id,
                await _attributeOptionIdsSerializer.SerializeAsync(new[]
                    { ProductsTestData.Product1Attribute1Option2Id, ProductsTestData.Product1Attribute2Option1Id }),
-                null, "CNY", null, 2m, 1, 10, null, null, null);
+                null, "USD", null, 2m, 1, 10, null, null, null);

            var productSku3 = new ProductSku(ProductsTestData.Product1Sku3Id,
                await _attributeOptionIdsSerializer.SerializeAsync(new[]
                    { ProductsTestData.Product1Attribute1Option3Id, ProductsTestData.Product1Attribute2Option2Id }),
-                null, "CNY", null, 3m, 1, 10, null, null, null);
+                null, "USD", null, 3m, 1, 10, null, null, null);
            
            await _productManager.CreateSkuAsync(product, productSku1);
            await _productManager.CreateSkuAsync(product, productSku2);
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/en.json
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/en.json
@ -10,7 +10,7 @@
    "OrderCake": "Order a cake",
    "CreateOrder": "Create order",
    "PayForOrder": "Pay for order",
-    "TopUp-1-CNY": "Top-up 1.00 CNY",
+    "TopUp-1-USD": "Top-up 1.00 USD",
    "OrderHistory": "Order history",
    "Flavor": "Flavor",
    "Size": "Size",
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/zh-Hans.json
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/zh-Hans.json
@ -10,7 +10,7 @@
    "OrderCake": "下单买蛋糕",
    "CreateOrder": "创建订单",
    "PayForOrder": "支付订单",
-    "TopUp-1-CNY": "充值 1.00 元",
+    "TopUp-1-USD": "充值 1.00 美元",
    "OrderHistory": "历史订单",
    "Flavor": "口味",
    "Size": "分量",
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/zh-Hant.json
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain.Shared/Localization/EShopSample/zh-Hant.json
@ -10,7 +10,7 @@
    "OrderCake": "下單買蛋糕",
    "CreateOrder": "創建訂單",
    "PayForOrder": "支付訂單",
-    "TopUp-1-CNY": "給賬戶充值",
+    "TopUp-1-USD": "充值 1.00 美元",
    "OrderHistory": "歷史訂單",
    "Flavor": "口味",
    "Size": "分量",
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/Data/SampleDataSeedContributor.cs
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/Data/SampleDataSeedContributor.cs
@ -156,22 +156,22 @@ public class SampleDataSeedContributor : IDataSeedContributor, ITransientDepende
        var productSku1 = new ProductSku(_guidGenerator.Create(),
            await _attributeOptionIdsSerializer.SerializeAsync(new[]
                { attribute1.ProductAttributeOptions[0].Id, attribute2.ProductAttributeOptions[0].Id }),
-            null, "CNY", null, 1m, 1, 10, null, null, null);
+            null, "USD", null, 1m, 1, 10, null, null, null);

        var productSku2 = new ProductSku(_guidGenerator.Create(),
            await _attributeOptionIdsSerializer.SerializeAsync(new[]
                { attribute1.ProductAttributeOptions[1].Id, attribute2.ProductAttributeOptions[0].Id }),
-            null, "CNY", null, 2m, 1, 10, null, null, null);
+            null, "USD", null, 2m, 1, 10, null, null, null);

        var productSku3 = new ProductSku(_guidGenerator.Create(),
            await _attributeOptionIdsSerializer.SerializeAsync(new[]
                { attribute1.ProductAttributeOptions[1].Id, attribute2.ProductAttributeOptions[1].Id }),
-            null, "CNY", null, 3m, 1, 10, null, null, null);
+            null, "USD", null, 3m, 1, 10, null, null, null);

        var productSku4 = new ProductSku(_guidGenerator.Create(),
            await _attributeOptionIdsSerializer.SerializeAsync(new[]
                { attribute1.ProductAttributeOptions[2].Id, attribute2.ProductAttributeOptions[1].Id }),
-            null, "CNY", null, 4m, 1, 10, null, null, null);
+            null, "USD", null, 4m, 1, 10, null, null, null);

        await _productManager.CreateSkuAsync(product, productSku1);
        await _productManager.CreateSkuAsync(product, productSku2);
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSampleDomainModule.cs
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Domain/EShopSampleDomainModule.cs
@ -78,7 +78,7 @@ namespace EShopSample
            {
                options.AccountGroups.Configure<DefaultAccountGroup>(accountGroup =>
                {
-                    accountGroup.Currency = "CNY";
+                    accountGroup.Currency = "USD";
                });
            });
        }
--- a/samples/EShopSample/aspnet-core/src/EShopSample.Web/Pages/Index.cshtml
+++ b/samples/EShopSample/aspnet-core/src/EShopSample.Web/Pages/Index.cshtml
@ -97,7 +97,7 @@ let secondsToAutoCancel = @Model.GetSecondsToAutoCancel()
                                </div>
                            </div>
                            <abp-button id="CancelOrderButton" button-type="Info">@L["CancelOrder"]</abp-button>
-                            <abp-button id="TopUpButton" button-type="Secondary">@L["TopUp-1-CNY"]</abp-button>
+                            <abp-button id="TopUpButton" button-type="Secondary">@L["TopUp-1-USD"]</abp-button>
                            <abp-button id="PayForOrderButton" button-type="Primary">@L["PayForOrder"]</abp-button>
                        }
                    </abp-tab>