diff --git a/Netina.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor b/Netina.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor index 0b57e16..a3f9105 100644 --- a/Netina.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor +++ b/Netina.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor @@ -235,7 +235,12 @@ - + @@ -251,11 +256,11 @@ - - + + - + diff --git a/Netina.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor.cs b/Netina.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor.cs index 2ed2574..a219b93 100644 --- a/Netina.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor.cs +++ b/Netina.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor.cs @@ -61,11 +61,13 @@ public class ProductActionDialogBoxViewModel : BaseViewModel { _isSpecialOffer = value; PageDto.IsSpecialOffer = value; - if(!value) + if (!value) { IsAmountType = value; IsPercentType = value; } + else if(!IsAmountType) + IsPercentType = true; } } @@ -108,6 +110,7 @@ public class ProductActionDialogBoxViewModel : BaseViewModel ExpireDate = Discount.ExpireDate; StartDate = Discount.StartDate; + IsSpecialOffer = true; } } catch (ApiException ex) @@ -236,10 +239,12 @@ public class ProductActionDialogBoxViewModel : BaseViewModel case DiscountAmountType.Amount: IsAmountType = true; IsPercentType = false; + Discount.AmountType = DiscountAmountType.Amount; break; case DiscountAmountType.Percent: IsAmountType = false; IsPercentType = true; + Discount.AmountType = DiscountAmountType.Percent; break; } } diff --git a/Netina.AdminPanel.PWA/Netina.AdminPanel.PWA.csproj b/Netina.AdminPanel.PWA/Netina.AdminPanel.PWA.csproj index 9ddf65a..a0e0d1f 100644 --- a/Netina.AdminPanel.PWA/Netina.AdminPanel.PWA.csproj +++ b/Netina.AdminPanel.PWA/Netina.AdminPanel.PWA.csproj @@ -55,7 +55,7 @@ - + diff --git a/Netina.AdminPanel.PWA/tailwind.config.js b/Netina.AdminPanel.PWA/tailwind.config.js index 958e212..8ffc555 100644 --- a/Netina.AdminPanel.PWA/tailwind.config.js +++ b/Netina.AdminPanel.PWA/tailwind.config.js @@ -29,7 +29,6 @@ module.exports = { } }, plugins: [ - require('@tailwindcss/typography'), require('flowbite/plugin') ], } diff --git a/Netina.AdminPanel.PWA/wwwroot/appsettings.Development.json b/Netina.AdminPanel.PWA/wwwroot/appsettings.Development.json index 2b98b81..91ba07a 100644 --- a/Netina.AdminPanel.PWA/wwwroot/appsettings.Development.json +++ b/Netina.AdminPanel.PWA/wwwroot/appsettings.Development.json @@ -8,10 +8,16 @@ "Microsoft.AspNetCore.Http.Connections": "Debug" } }, - "WebSiteUrl": "https://bonsaigallery.shop", - "AdminPanelBaseUrl": "https://admin.bonsaigallery.shop", - "StorageBaseUrl": "https://storage.bonsaigallery.shop", - "ApiUrl": "https://api.bonsaigallery.shop/api", + "WebSiteUrl": "https://vesmeh.com", + "AdminPanelBaseUrl": "https://admin.vesmeh.com", + "StorageBaseUrl": "https://storage.vesmeh.com", + //"ApiUrl": "https://api.vesmeh.com/api", + "ApiUrl": "http://localhost:32770/api", + + //"WebSiteUrl": "https://bonsaigallery.shop", + //"AdminPanelBaseUrl": "https://admin.bonsaigallery.shop", + //"StorageBaseUrl": "https://storage.bonsaigallery.shop", + //"ApiUrl": "https://api.bonsaigallery.shop/api", "IsShop": true //"ApiUrl": "http://localhost:32770/api" diff --git a/Netina.AdminPanel.PWA/wwwroot/index.html b/Netina.AdminPanel.PWA/wwwroot/index.html index 7fd1e95..f2930cc 100644 --- a/Netina.AdminPanel.PWA/wwwroot/index.html +++ b/Netina.AdminPanel.PWA/wwwroot/index.html @@ -43,7 +43,7 @@ -
+
مشکلی رخ داده است بارگزاری مجدد بستن diff --git a/Netina.AdminPanel.sln b/Netina.AdminPanel.sln index 505c6c0..5974162 100644 --- a/Netina.AdminPanel.sln +++ b/Netina.AdminPanel.sln @@ -5,9 +5,9 @@ VisualStudioVersion = 17.8.34316.72 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netina.AdminPanel.PWA", "Netina.AdminPanel.PWA\Netina.AdminPanel.PWA.csproj", "{EB154E26-A392-4521-B26D-1B82C8597201}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netina.Domain", "..\Netina\Netina.Domain\Netina.Domain.csproj", "{FD9AD662-66FB-431A-A2C1-8D6262402FCE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netina.Domain", "..\Api\Netina.Domain\Netina.Domain.csproj", "{FD9AD662-66FB-431A-A2C1-8D6262402FCE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netina.Common", "..\Netina\Netina.Common\Netina.Common.csproj", "{CE60F736-C3F2-4D81-862E-48135E5FFC9C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Netina.Common", "..\Api\Netina.Common\Netina.Common.csproj", "{CE60F736-C3F2-4D81-862E-48135E5FFC9C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution