Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: VirtoCommerce/vc-module-pricing
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.2.0
Choose a base ref
...
head repository: VirtoCommerce/vc-module-pricing
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dev
Choose a head ref

Commits on Jun 15, 2020

  1. VP-3122: Fix logo (#93)

    Egis authored Jun 15, 2020
    Copy the full SHA
    4d6ac10 View commit details

Commits on Jun 24, 2020

  1. VP-3187: Init CI

    lnetrebskii committed Jun 24, 2020
    Copy the full SHA
    08bda46 View commit details
  2. Sync workflows from vc-module-core

    GitHub Actions committed Jun 24, 2020
    Copy the full SHA
    b6f7c46 View commit details

Commits on Jul 2, 2020

  1. Sync workflows from vc-module-core

    GitHub Actions committed Jul 2, 2020
    Copy the full SHA
    5aff2b1 View commit details
  2. 3.3.0

    yecli committed Jul 2, 2020
    Copy the full SHA
    bd85e3d View commit details

Commits on Jul 17, 2020

  1. 3.4.0

    akak1977 committed Jul 17, 2020
    Copy the full SHA
    07b68d5 View commit details
  2. Sync workflows from vc-module-core

    GitHub Actions committed Jul 17, 2020
    Copy the full SHA
    059be32 View commit details

Commits on Jul 29, 2020

  1. VP-3266: Change PricelistAssignmentsCacheRegion, PricelistsCacheRegio…

    …n , PricesCacheRegion to support new cache expiration (#96)
    akak1977 authored Jul 29, 2020
    Copy the full SHA
    497cbf4 View commit details

Commits on Jul 30, 2020

  1. Copy the full SHA
    775ec67 View commit details

Commits on Jul 31, 2020

  1. 3.5.0

    akak1977 committed Jul 31, 2020
    Copy the full SHA
    21d97d9 View commit details

Commits on Aug 31, 2020

  1. Copy the full SHA
    90bcfd2 View commit details
  2. Sync workflows from vc-module-core

    GitHub Actions committed Aug 31, 2020
    Copy the full SHA
    1d22ef2 View commit details

Commits on Sep 1, 2020

  1. Copy the full SHA
    d7f453a View commit details

Commits on Sep 2, 2020

  1. Copy the full SHA
    c532cc2 View commit details

Commits on Sep 8, 2020

  1. Copy the full SHA
    b5a924c View commit details
  2. Copy the full SHA
    7b9388b View commit details

Commits on Sep 9, 2020

  1. 3.6.0

    akak1977 committed Sep 9, 2020
    Copy the full SHA
    5a06de0 View commit details

Commits on Sep 16, 2020

  1. Copy the full SHA
    92f2994 View commit details

Commits on Sep 29, 2020

  1. Copy the full SHA
    b3f483f View commit details

Commits on Sep 30, 2020

  1. Copy the full SHA
    148cca3 View commit details

Commits on Oct 1, 2020

  1. 3.7.0

    akak1977 committed Oct 1, 2020
    Copy the full SHA
    79fa96f View commit details
  2. Copy the full SHA
    a5654d3 View commit details

Commits on Oct 6, 2020

  1. 3.8.0

    akak1977 committed Oct 6, 2020
    Copy the full SHA
    07c9104 View commit details

Commits on Oct 12, 2020

  1. Copy the full SHA
    15b33c6 View commit details

Commits on Oct 13, 2020

  1. Copy the full SHA
    f74d3a7 View commit details

Commits on Oct 16, 2020

  1. 3.9.0

    akak1977 committed Oct 16, 2020
    Copy the full SHA
    1ff17bb View commit details
  2. VP-5265: Fix error when price without product (#107)

    * Add default product name if product do not exist for selected price
    
    * Highlight row in gray
    
    * minor refactoring
    
    * move label to localization
    
    Co-authored-by: Andrey Kozlov <yecli.github@gmail.com>
    AliveMen and yecli authored Oct 16, 2020
    Copy the full SHA
    0d694dc View commit details

Commits on Oct 20, 2020

  1. Copy the full SHA
    361bab5 View commit details

Commits on Oct 21, 2020

  1. Copy the full SHA
    24161cf View commit details

Commits on Oct 26, 2020

  1. 3.10.0

    yecli committed Oct 26, 2020
    Copy the full SHA
    d97433d View commit details
  2. Copy the full SHA
    9580f7d View commit details

Commits on Oct 28, 2020

  1. Copy the full SHA
    806796d View commit details

Commits on Nov 10, 2020

  1. VP-5673: Fix page size positive only (#110)

    * VP-5673: Fix page size positive only
    
    * fix: update mainfest
    
    * Update module.manifest
    
    * update dependencies
    Vectorfield4 authored Nov 10, 2020
    Copy the full SHA
    4f85503 View commit details

Commits on Nov 11, 2020

  1. 3.11.0

    yecli committed Nov 11, 2020
    Copy the full SHA
    2b905c8 View commit details

Commits on Nov 12, 2020

  1. VP-1313: Clear filter when clear button pressed (#111)

    * VP-1313 Filter pricelists after clear filter and reload page
    Clear local storage
    
    * refactoring
    AliveMen authored Nov 12, 2020
    Copy the full SHA
    2eae0ad View commit details

Commits on Nov 13, 2020

  1. 3.12.0

    yecli committed Nov 13, 2020
    Copy the full SHA
    22d9162 View commit details

Commits on Nov 18, 2020

  1. VP-5618: Add ability to switch changes logging into platform operatio…

    …ns log thru platform settings (#112)
    akak1977 authored Nov 18, 2020
    Copy the full SHA
    fa370fa View commit details
  2. Copy the full SHA
    7df8082 View commit details
  3. 3.13.0

    akak1977 committed Nov 18, 2020
    Copy the full SHA
    a52eb21 View commit details

Commits on Nov 30, 2020

  1. Fix broken links

    OlegoO authored Nov 30, 2020
    Copy the full SHA
    f6070b6 View commit details

Commits on Dec 7, 2020

  1. VP-6270: Add badges

    mvktsk authored Dec 7, 2020
    Copy the full SHA
    73306bc View commit details

Commits on Dec 8, 2020

  1. Copy the full SHA
    5d0401b View commit details

Commits on Dec 9, 2020

  1. Copy the full SHA
    eb4aeae View commit details

Commits on Dec 10, 2020

  1. Copy the full SHA
    38d6e68 View commit details
  2. 3.14.0

    akak1977 committed Dec 10, 2020
    Copy the full SHA
    87e1a0c View commit details

Commits on Dec 17, 2020

  1. Copy the full SHA
    13548f2 View commit details

Commits on Jan 14, 2021

  1. Copy the full SHA
    8cd65c3 View commit details

Commits on Jan 18, 2021

  1. Copy the full SHA
    796fca4 View commit details

Commits on Jan 19, 2021

  1. Merge branch 'release/3.14.0'

    OlegoO committed Jan 19, 2021
    Copy the full SHA
    b358d26 View commit details
  2. 3.15.0

    OlegoO committed Jan 19, 2021
    Copy the full SHA
    566b1d9 View commit details
Showing with 12,228 additions and 7,341 deletions.
  1. +29 −0 .deployment/module/argoDeploy.json
  2. +29 −0 .deployment/module/cloudDeploy.json
  3. +105 −10 .editorconfig
  4. +16 −0 .github/CODEOWNERS
  5. +6 −0 .github/pull_request_template.md
  6. +44 −0 .github/workflows/deploy-pr.yml
  7. +78 −0 .github/workflows/deploy.yml
  8. +272 −0 .github/workflows/module-ci.yml
  9. +82 −0 .github/workflows/module-release-hotfix.yml
  10. +54 −0 .github/workflows/msteams.yml
  11. +38 −0 .github/workflows/publish-nugets.yml
  12. +12 −0 .github/workflows/release.yml
  13. +5 −1 Directory.Build.Props → Directory.Build.props
  14. +0 −2 Jenkinsfile
  15. +17 −29 README.md
  16. +23 −2 VirtoCommerce.PricingModule.sln
  17. +6 −0 VirtoCommerce.PricingModule.sln.DotSettings
  18. +9 −8 docs/add-new-assignment.md
  19. +8 −8 docs/add-prices-to-products.md
  20. +5 −5 docs/add-products-to-the-new-price-list.md
  21. +3 −3 docs/create-new-price-list.md
  22. +91 −0 docs/index.md
  23. +1 −1 docs/managing-pricing-module-settings.md
  24. BIN docs/media/screen-correcnt-assignment.png
  25. BIN docs/media/screen-new-price-list-assignment.png
  26. BIN docs/media/screen-price-correct.png
  27. BIN docs/media/screen-price-wrong.png
  28. +18 −0 docs/troubleshooting-guide.md
  29. +3 −3 docs/view-price-list-via-catalog-module.md
  30. +54 −0 mkdocs.yaml
  31. +5 −0 module.ignore
  32. +2 −0 module.keep
  33. +14 −0 src/VirtoCommerce.PricingModule.Core/Events/PricelistAssignmentChangedEvent.cs
  34. +14 −0 src/VirtoCommerce.PricingModule.Core/Events/PricelistAssignmentChangingEvent.cs
  35. +14 −0 src/VirtoCommerce.PricingModule.Core/Events/PricelistChangedEvent.cs
  36. +14 −0 src/VirtoCommerce.PricingModule.Core/Events/PricelistChangingEvent.cs
  37. +8 −0 src/VirtoCommerce.PricingModule.Core/Model/IndexedPrice.cs
  38. +21 −0 src/VirtoCommerce.PricingModule.Core/Model/MergedPrice.cs
  39. +23 −0 src/VirtoCommerce.PricingModule.Core/Model/MergedPriceGroup.cs
  40. +9 −0 src/VirtoCommerce.PricingModule.Core/Model/MergedPriceState.cs
  41. +17 −13 src/VirtoCommerce.PricingModule.Core/Model/PriceEvaluationContext.cs
  42. +1 −0 src/VirtoCommerce.PricingModule.Core/Model/PriceList.cs
  43. +14 −0 src/VirtoCommerce.PricingModule.Core/Model/PriceListResponseGroup.cs
  44. +1 −0 src/VirtoCommerce.PricingModule.Core/Model/PricelistAssignment.cs
  45. +8 −0 src/VirtoCommerce.PricingModule.Core/Model/Search/MergedPriceGroupSearchResult.cs
  46. +16 −0 src/VirtoCommerce.PricingModule.Core/Model/Search/MergedPriceSearchCriteria.cs
  47. +8 −0 src/VirtoCommerce.PricingModule.Core/Model/Search/MergedPriceSearchResult.cs
  48. +7 −3 src/VirtoCommerce.PricingModule.Core/Model/Search/PricelistAssignmentsSearchCriteria.cs
  49. +3 −1 src/VirtoCommerce.PricingModule.Core/Model/Search/PricelistSearchCriteria.cs
  50. +5 −4 src/VirtoCommerce.PricingModule.Core/Model/Search/PricesSearchCriteria.cs
  51. +0 −12 src/VirtoCommerce.PricingModule.Core/Model/Search/PricingSearchResult.cs
  52. +27 −10 src/VirtoCommerce.PricingModule.Core/ModuleConstants.cs
  53. +12 −0 src/VirtoCommerce.PricingModule.Core/Services/IMergedPriceSearchService.cs
  54. +9 −0 src/VirtoCommerce.PricingModule.Core/Services/IPriceSearchService.cs
  55. +8 −0 src/VirtoCommerce.PricingModule.Core/Services/IPriceService.cs
  56. +9 −0 src/VirtoCommerce.PricingModule.Core/Services/IPricelistAssignmentSearchService.cs
  57. +8 −0 src/VirtoCommerce.PricingModule.Core/Services/IPricelistAssignmentService.cs
  58. +9 −0 src/VirtoCommerce.PricingModule.Core/Services/IPricelistSearchService.cs
  59. +8 −0 src/VirtoCommerce.PricingModule.Core/Services/IPricelistService.cs
  60. +24 −0 src/VirtoCommerce.PricingModule.Core/Services/IPricingEvaluatorService.cs
  61. +0 −12 src/VirtoCommerce.PricingModule.Core/Services/IPricingSearchService.cs
  62. +0 −24 src/VirtoCommerce.PricingModule.Core/Services/IPricingService.cs
  63. +14 −5 src/VirtoCommerce.PricingModule.Core/VirtoCommerce.PricingModule.Core.csproj
  64. +261 −0 src/VirtoCommerce.PricingModule.Data.MySql/Migrations/20221226150717_Initial.Designer.cs
  65. +152 −0 src/VirtoCommerce.PricingModule.Data.MySql/Migrations/20221226150717_Initial.cs
  66. +259 −0 src/VirtoCommerce.PricingModule.Data.MySql/Migrations/PricingDbContextModelSnapshot.cs
  67. +5 −0 src/VirtoCommerce.PricingModule.Data.MySql/MySqlDataAssemblyMarker.cs
  68. +37 −0 src/VirtoCommerce.PricingModule.Data.MySql/MySqlDbContextFactory.cs
  69. +15 −0 src/VirtoCommerce.PricingModule.Data.MySql/PriceEntityConfiguration.cs
  70. +24 −0 src/VirtoCommerce.PricingModule.Data.MySql/Readme.md
  71. +21 −0 src/VirtoCommerce.PricingModule.Data.MySql/VirtoCommerce.PricingModule.Data.MySql.csproj
  72. +262 −0 src/VirtoCommerce.PricingModule.Data.PostgreSql/Migrations/20221226150451_Initial.Designer.cs
  73. +121 −0 src/VirtoCommerce.PricingModule.Data.PostgreSql/Migrations/20221226150451_Initial.cs
  74. +260 −0 src/VirtoCommerce.PricingModule.Data.PostgreSql/Migrations/PricingDbContextModelSnapshot.cs
  75. +5 −0 src/VirtoCommerce.PricingModule.Data.PostgreSql/PostgreSqlDataAssemblyMarker.cs
  76. +21 −0 src/VirtoCommerce.PricingModule.Data.PostgreSql/PostgreSqlDbContextFactory.cs
  77. +24 −0 src/VirtoCommerce.PricingModule.Data.PostgreSql/Readme.md
  78. +21 −0 src/VirtoCommerce.PricingModule.Data.PostgreSql/VirtoCommerce.PricingModule.Data.PostgreSql.csproj
  79. +1 −1 ...VirtoCommerce.PricingModule.Data.SqlServer}/Migrations/20000000000000_UpdatePricingV2.Designer.cs
  80. +3 −3 ...e.Data → VirtoCommerce.PricingModule.Data.SqlServer}/Migrations/20000000000000_UpdatePricingV2.cs
  81. +2 −2 ... VirtoCommerce.PricingModule.Data.SqlServer}/Migrations/20190520064847_InitialPricing.Designer.cs
  82. +1 −2 ...le.Data → VirtoCommerce.PricingModule.Data.SqlServer}/Migrations/20190520064847_InitialPricing.cs
  83. +2 −2 ...rtoCommerce.PricingModule.Data.SqlServer}/Migrations/20190613202636_AddPricingOuterId.Designer.cs
  84. +1 −1 ...Data → VirtoCommerce.PricingModule.Data.SqlServer}/Migrations/20190613202636_AddPricingOuterId.cs
  85. +2 −2 ...e.PricingModule.Data.SqlServer}/Migrations/20191009090449_AddPriceStartDateAndEndDate.Designer.cs
  86. +1 −2 ...toCommerce.PricingModule.Data.SqlServer}/Migrations/20191009090449_AddPriceStartDateAndEndDate.cs
  87. +213 −0 ...erce.PricingModule.Data.SqlServer/Migrations/20210119074026_AddProductPriceDatesIndex.Designer.cs
  88. +43 −0 ...VirtoCommerce.PricingModule.Data.SqlServer/Migrations/20210119074026_AddProductPriceDatesIndex.cs
  89. +218 −0 src/VirtoCommerce.PricingModule.Data.SqlServer/Migrations/20211214085930_AddStoreId.Designer.cs
  90. +42 −0 src/VirtoCommerce.PricingModule.Data.SqlServer/Migrations/20211214085930_AddStoreId.cs
  91. +65 −26 ...le.Data → VirtoCommerce.PricingModule.Data.SqlServer}/Migrations/PricingDbContextModelSnapshot.cs
  92. +25 −0 src/VirtoCommerce.PricingModule.Data.SqlServer/Readme.md
  93. +5 −0 src/VirtoCommerce.PricingModule.Data.SqlServer/SqlServerDataAssemblyMarker.cs
  94. +21 −0 src/VirtoCommerce.PricingModule.Data.SqlServer/SqlServerDbContextFactory.cs
  95. +21 −0 src/VirtoCommerce.PricingModule.Data.SqlServer/VirtoCommerce.PricingModule.Data.SqlServer.csproj
  96. +11 −14 src/VirtoCommerce.PricingModule.Data/Caching/PricelistAssignmentsCacheRegion.cs
  97. +11 −13 src/VirtoCommerce.PricingModule.Data/Caching/PricelistsCacheRegion.cs
  98. +11 −13 src/VirtoCommerce.PricingModule.Data/Caching/PricesCacheRegion.cs
  99. +2 −5 src/VirtoCommerce.PricingModule.Data/Common/ModuleConfigurator.cs
  100. +36 −26 src/VirtoCommerce.PricingModule.Data/ExportImport/PricingExportImport.cs
  101. +22 −18 src/VirtoCommerce.PricingModule.Data/ExportImport2/PriceExportPagedDataSource.cs
  102. +22 −18 src/VirtoCommerce.PricingModule.Data/ExportImport2/PricelistAssignmentExportPagedDataSource.cs
  103. +14 −22 src/VirtoCommerce.PricingModule.Data/ExportImport2/PricelistExportPagedDataSource.cs
  104. +26 −10 src/VirtoCommerce.PricingModule.Data/ExportImport2/PricingExportPagedDataSourceFactory.cs
  105. +22 −8 src/VirtoCommerce.PricingModule.Data/Handlers/DeletePricesProductChangedEventHandler.cs
  106. +18 −7 src/VirtoCommerce.PricingModule.Data/Handlers/IndexPricesProductChangedEventHandler.cs
  107. +26 −9 src/VirtoCommerce.PricingModule.Data/Handlers/LogChangesChangedEventHandler.cs
  108. +34 −0 src/VirtoCommerce.PricingModule.Data/Model/MergedPriceEntity.cs
  109. +32 −0 src/VirtoCommerce.PricingModule.Data/Model/MergedPriceGroupEntity.cs
  110. +3 −1 src/VirtoCommerce.PricingModule.Data/Model/PriceEntity.cs
  111. +8 −2 src/VirtoCommerce.PricingModule.Data/Model/PricelistAssignmentEntity.cs
  112. +3 −1 src/VirtoCommerce.PricingModule.Data/Model/PricelistEntity.cs
  113. +0 −17 src/VirtoCommerce.PricingModule.Data/Repositories/DesignTimeDbContextFactory.cs
  114. +14 −11 src/VirtoCommerce.PricingModule.Data/Repositories/IPricingRepository.cs
  115. +30 −3 src/VirtoCommerce.PricingModule.Data/Repositories/PricingDbContext.cs
  116. +102 −29 src/VirtoCommerce.PricingModule.Data/Repositories/PricingRepositoryImpl.cs
  117. +144 −21 src/VirtoCommerce.PricingModule.Data/Search/ProductPriceDocumentBuilder.cs
  118. +40 −13 src/VirtoCommerce.PricingModule.Data/Search/ProductPriceDocumentChangesProvider.cs
  119. +61 −27 src/VirtoCommerce.PricingModule.Data/Services/DefaultPricingPriorityFilterPolicy.cs
  120. +191 −0 src/VirtoCommerce.PricingModule.Data/Services/MergedPriceSearchService.cs
  121. +179 −0 src/VirtoCommerce.PricingModule.Data/Services/PriceSearchService.cs
  122. +114 −0 src/VirtoCommerce.PricingModule.Data/Services/PriceService.cs
  123. +71 −0 src/VirtoCommerce.PricingModule.Data/Services/PricelistAssignmentSearchService.cs
  124. +55 −0 src/VirtoCommerce.PricingModule.Data/Services/PricelistAssignmentService.cs
  125. +66 −0 src/VirtoCommerce.PricingModule.Data/Services/PricelistSearchService.cs
  126. +28 −0 src/VirtoCommerce.PricingModule.Data/Services/PricelistService.cs
  127. +239 −0 src/VirtoCommerce.PricingModule.Data/Services/PricingEvaluatorService.cs
  128. +0 −286 src/VirtoCommerce.PricingModule.Data/Services/PricingSearchServiceImpl.cs
  129. +0 −451 src/VirtoCommerce.PricingModule.Data/Services/PricingServiceImpl.cs
  130. +26 −0 src/VirtoCommerce.PricingModule.Data/Validators/PriceListValidator.cs
  131. +20 −0 src/VirtoCommerce.PricingModule.Data/Validators/PricelistAssignmentsValidator.cs
  132. +14 −23 src/VirtoCommerce.PricingModule.Data/VirtoCommerce.PricingModule.Data.csproj
  133. +139 −65 src/VirtoCommerce.PricingModule.Web/Controllers/Api/PricingModuleController.cs
  134. +0 −41 src/VirtoCommerce.PricingModule.Web/JsonConverters/PolymorphicPricingJsonConverter.cs
  135. +311 −171 src/VirtoCommerce.PricingModule.Web/Localizations/de.VirtoCommerce.Pricing.json
  136. +89 −69 src/VirtoCommerce.PricingModule.Web/Localizations/en.VirtoCommerce.Pricing.json
  137. +321 −0 src/VirtoCommerce.PricingModule.Web/Localizations/es.VirtoCommerce.Pricing.json
  138. +321 −0 src/VirtoCommerce.PricingModule.Web/Localizations/fr.VirtoCommerce.Pricing.json
  139. +321 −0 src/VirtoCommerce.PricingModule.Web/Localizations/it.VirtoCommerce.Pricing.json
  140. +321 −0 src/VirtoCommerce.PricingModule.Web/Localizations/ja.VirtoCommerce.Pricing.json
  141. +321 −0 src/VirtoCommerce.PricingModule.Web/Localizations/pl.VirtoCommerce.Pricing.json
  142. +321 −0 src/VirtoCommerce.PricingModule.Web/Localizations/pt.VirtoCommerce.Pricing.json
  143. +311 −201 src/VirtoCommerce.PricingModule.Web/Localizations/ru.VirtoCommerce.Pricing.json
  144. +321 −0 src/VirtoCommerce.PricingModule.Web/Localizations/zh.VirtoCommerce.Pricing.json
  145. +83 −67 src/VirtoCommerce.PricingModule.Web/Module.cs
  146. +29 −11 src/VirtoCommerce.PricingModule.Web/Scripts/blades/assignment-detail.js
  147. +32 −26 src/VirtoCommerce.PricingModule.Web/Scripts/blades/assignment-detail.tpl.html
  148. +29 −16 src/VirtoCommerce.PricingModule.Web/Scripts/blades/assignment-list.js
  149. +12 −15 src/VirtoCommerce.PricingModule.Web/Scripts/blades/assignment-list.tpl.html
  150. +1 −1 src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-pricelists-list.js
  151. +274 −210 src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-prices.js
  152. +55 −54 src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-prices.tpl.html
  153. +6 −6 src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-detail.js
  154. +2 −2 src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-detail.tpl.html
  155. +78 −52 src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-item-list.js
  156. +22 −12 src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-item-list.tpl.html
  157. +18 −14 src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-list.js
  158. +12 −15 src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricelist-list.tpl.html
  159. +271 −206 src/VirtoCommerce.PricingModule.Web/Scripts/blades/prices-list.js
  160. +42 −42 src/VirtoCommerce.PricingModule.Web/Scripts/blades/prices-list.tpl.html
  161. +4 −4 src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricing-main.js
  162. +2 −2 src/VirtoCommerce.PricingModule.Web/Scripts/blades/pricing-main.tpl.html
  163. +139 −137 src/VirtoCommerce.PricingModule.Web/Scripts/pricing.js
  164. +6 −0 src/VirtoCommerce.PricingModule.Web/Scripts/resources/pricing.js
  165. +3 −3 src/VirtoCommerce.PricingModule.Web/Scripts/selectors/catalog-selector.js
  166. +4 −6 src/VirtoCommerce.PricingModule.Web/Scripts/selectors/catalog-selector.tpl.html
  167. +3 −3 src/VirtoCommerce.PricingModule.Web/Scripts/selectors/pricelist-selector.js
  168. +4 −6 src/VirtoCommerce.PricingModule.Web/Scripts/selectors/pricelist-selector.tpl.html
  169. +3 −2 src/VirtoCommerce.PricingModule.Web/Scripts/widgets/pricesWidget.js
  170. +11 −5 src/VirtoCommerce.PricingModule.Web/VirtoCommerce.PricingModule.Web.csproj
  171. +22 −18 src/VirtoCommerce.PricingModule.Web/module.manifest
  172. +1,998 −4,346 src/VirtoCommerce.PricingModule.Web/package-lock.json
  173. +18 −17 src/VirtoCommerce.PricingModule.Web/package.json
  174. +28 −18 src/VirtoCommerce.PricingModule.Web/webpack.config.js
  175. +6 −38 tests/VirtoCommerce.PricingModule.Test/ConditionJsonSerializerTests.cs
  176. +53 −22 tests/VirtoCommerce.PricingModule.Test/ExportImport2Test.cs
  177. +23 −24 tests/VirtoCommerce.PricingModule.Test/ExportImportTest.cs
  178. +46 −0 tests/VirtoCommerce.PricingModule.Test/Helpers/ConditionExpressionHelper.cs
  179. +144 −139 tests/VirtoCommerce.PricingModule.Test/PriceScenarios.cs
  180. +232 −0 tests/VirtoCommerce.PricingModule.Test/PricingEvaluatorServiceTests.cs
  181. +152 −0 tests/VirtoCommerce.PricingModule.Test/PricingServiceImplUnitTests.cs
  182. +38 −1 tests/VirtoCommerce.PricingModule.Test/Resources/TestSerializedCondition.json
  183. +21 −0 tests/VirtoCommerce.PricingModule.Test/Resources/UserGroupsSerializedCondition.json
  184. +16 −9 tests/VirtoCommerce.PricingModule.Test/VirtoCommerce.PricingModule.Test.csproj
29 changes: 29 additions & 0 deletions .deployment/module/argoDeploy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"artifactKey": "VirtoCommerce.Pricing",
"deployRepo": "vc-deploy-dev",
"cmPath": "platform-dev/resources/deployment-cm.yaml",
"dev": {
"deployAppName": "vcplatform-dev",
"deployBranch": "dev",
"environmentId": "dev",
"environmentName": "Development",
"environmentType": "staging",
"environmentUrl": "https://vcplatform-platform.dev.govirto.com/"
},
"qa": {
"deployAppName": "vcplatform-qa",
"deployBranch": "qa",
"environmentId": "qa",
"environmentName": "QA",
"environmentType": "testing",
"environmentUrl": "https://vcplatform-platform.qa.govirto.com/"
},
"prod": {
"deployAppName": "vcplatform-demo",
"deployBranch": "demo",
"environmentId": "prod",
"environmentName": "Demo",
"environmentType": "production",
"environmentUrl": "https://vcplatform-platform.demo.govirto.com/"
}
}
29 changes: 29 additions & 0 deletions .deployment/module/cloudDeploy.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"artifactKey": "VirtoCommerce.Pricing",
"deployRepo": "vc-deploy-dev",
"cmPath": "backend/packages.json",
"dev": {
"deployAppName": "vcptcore-dev",
"deployBranch": "vcptcore-dev",
"environmentId": "dev",
"environmentName": "Development",
"environmentType": "staging",
"environmentUrl": "https://vcptcore-dev.govirto.com/"
},
"qa": {
"deployAppName": "vcptcore-qa",
"deployBranch": "vcptcore-qa",
"environmentId": "qa",
"environmentName": "QA",
"environmentType": "testing",
"environmentUrl": "https://vcptcore-qa.govirto.com/"
},
"prod": {
"deployAppName": "vcptcore-demo",
"deployBranch": "vcptcore-demo",
"environmentId": "prod",
"environmentName": "Demo",
"environmentType": "production",
"environmentUrl": "https://vcptcore-demo.govirto.com/"
}
}
115 changes: 105 additions & 10 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -3,12 +3,24 @@ root = true
[*]
charset = utf-8
indent_style = space
indent_size = 4
indent_size = 2
end_of_line = crlf
trim_trailing_whitespace = true
insert_final_newline = true

# Dotnet code style settings:
# Project files
[*.{csproj,props}]
insert_final_newline = false

# HTML files
[*.{html,htm}]
insert_final_newline = false

# Code
[*.{cs,js,ts,ps1,sh,bat,cmd}]
indent_size = 4

# Dotnet code style settings
[*.{cs,vb}]

# Sort using and Import directives with System.* appearing first
@@ -24,16 +36,24 @@ dotnet_style_qualification_for_event = false:suggestion
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
dotnet_style_predefined_type_for_member_access = true:suggestion

# Use explicit accessibility modifiers
dotnet_style_require_accessibility_modifiers = true:suggestion

# Suggest more modern language features when available
dotnet_style_object_initializer = true:suggestion
dotnet_style_collection_initializer = true:suggestion
dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion
dotnet_prefer_inferred_tuple_names = true:suggestion
dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion

# CSharp code style settings:
# CSharp code style settings
[*.cs]

# Prefer curly braces even for one line of code
csharp_prefer_braces = true:suggestion

# Prefer "var" everywhere
csharp_style_var_for_built_in_types = true:suggestion
csharp_style_var_when_type_is_apparent = true:suggestion
@@ -55,6 +75,9 @@ csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
csharp_style_inlined_variable_declaration = true:suggestion
csharp_style_throw_expression = true:suggestion
csharp_style_conditional_delegate_call = true:suggestion
csharp_prefer_simple_default_expression = true:suggestion
csharp_style_deconstructed_variable_declaration = true:suggestion
csharp_style_pattern_local_over_anonymous_function = true:suggestion

# Newline settings
csharp_new_line_before_open_brace = all
@@ -63,12 +86,84 @@ csharp_new_line_before_catch = true
csharp_new_line_before_finally = true
csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_between_query_expression_clauses = true

#JSON code style settings
[*.json]
indent_style = space
indent_size = 2
csharp_indent_case_contents = true
csharp_indent_switch_labels = true
csharp_indent_labels = flush_left

csharp_space_after_cast = false
csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_parentheses = false

csharp_preserve_single_line_statements = false
csharp_preserve_single_line_blocks = true
csharp_using_directive_placement = outside_namespace:silent
csharp_prefer_simple_using_statement = true:suggestion
csharp_style_namespace_declarations = file_scoped:silent
csharp_style_prefer_method_group_conversion = true:silent
csharp_style_prefer_top_level_statements = true:silent
csharp_style_expression_bodied_lambdas = true:silent
csharp_style_expression_bodied_local_functions = false:silent

[*.{cs,vb}]
#### Naming styles ####

# Naming rules

dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i

dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.types_should_be_pascal_case.symbols = types
dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case

dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case

# Symbol specifications

dotnet_naming_symbols.interface.applicable_kinds = interface
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.interface.required_modifiers =

dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.types.required_modifiers =

dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.non_field_members.required_modifiers =

# Naming styles

dotnet_naming_style.begins_with_i.required_prefix = I
dotnet_naming_style.begins_with_i.required_suffix =
dotnet_naming_style.begins_with_i.word_separator =
dotnet_naming_style.begins_with_i.capitalization = pascal_case

dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case

#HTML code style settings
[*.html]
insert_final_newline = false
dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case
dotnet_style_operator_placement_when_wrapping = beginning_of_line
tab_width = 4
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
dotnet_style_prefer_auto_properties = true:silent
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_conditional_expression_over_return = true:silent
dotnet_style_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_style_prefer_compound_assignment = true:suggestion
dotnet_style_prefer_simplified_interpolation = true:suggestion
dotnet_style_namespace_match_folder = true:suggestion
16 changes: 16 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Common settings

.github/* @VirtoCommerce/platform
.gitignore @VirtoCommerce/platform
.dockerignore @VirtoCommerce/platform

# Main Code and Tests

src/* @VirtoCommerce/platform
tests/* @VirtoCommerce/platform
.editorconfig @VirtoCommerce/platform
3rd-party-components.md @VirtoCommerce/platform
VirtoCommerce.Platform.sln @VirtoCommerce/platform

# Docs
docs/* @VirtoCommerce/platform
6 changes: 6 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
## Description

## References
### QA-test:
### Jira-link:
### Artifact URL:
44 changes: 44 additions & 0 deletions .github/workflows/deploy-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# v1.0

name: Deploy to environments
on:
pull_request:
paths-ignore:
- '.github/**'
- 'docs/**'
- 'build/**'
- 'README.md'
- 'LICENSE'
- '**/argoDeploy.json'
branches: [dev]
types: [labeled, closed]

jobs:
deploy:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }}

steps:
- name: Read deployment config
if: contains(github.event.pull_request.labels.*.name, 'deploy-qa')
uses: VirtoCommerce/vc-github-actions/get-deploy-param@master
id: deployConfig

- name: Gets artifact link
if: contains(github.event.pull_request.labels.*.name, 'deploy-qa')
uses: VirtoCommerce/vc-github-actions/get-artifact-link@master
id: artifactLink
with:
downloadComment: 'Artifact URL:'

- name: Create deploy PR in QA
if: github.event.action != 'closed' && contains(github.event.pull_request.labels.*.name, 'deploy-qa')
uses: VirtoCommerce/vc-github-actions/create-deploy-pr@master
with:
deployRepo: ${{ steps.deployConfig.outputs.deployRepo }}
deployBranch: ${{ fromJSON(steps.deployConfig.outputs.deployConfig).qa.deployBranch }}
artifactKey: ${{ steps.deployConfig.outputs.artifactKey }}
artifactUrl: ${{ steps.artifactLink.outputs.artifactUrl }}
taskNumber: ${{ steps.artifactLink.outputs.qaTaskNumber }}
cmPath: ${{ steps.deployConfig.outputs.cmPath }}
78 changes: 78 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
# v1.0

name: VC deployment
on:
workflow_dispatch:
inputs:
artifactUrl:
description: 'Full link to artifact docker image or artifact download url'
required: true
deployBranch:
description: 'ArgoCd branch name'
required: true
default: 'dev'

jobs:
cd:
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{ secrets.REPO_TOKEN }}

steps:

- name: Read deployment config
uses: VirtoCommerce/vc-github-actions/get-deploy-param@master
id: deployConfig
with:
envName: ${{ github.event.inputs.deployBranch }}

- name: Start deployment
uses: bobheadxi/deployments@master
id: deployment
with:
step: start
token: ${{ secrets.GITHUB_TOKEN }}
env: Development
no_override: false

- name: Update deployment-cm
uses: VirtoCommerce/vc-github-actions/create-deploy-pr@master
with:
deployRepo: ${{ steps.deployConfig.outputs.deployRepo }}
deployBranch: ${{ steps.deployConfig.outputs.deployBranch }}
artifactKey: ${{ steps.deployConfig.outputs.artifactKey }}
artifactUrl: ${{ github.event.inputs.artifactUrl }}
taskNumber: "undefined"
forceCommit: "true"
cmPath: ${{ steps.deployConfig.outputs.cmPath }}

- name: Wait for environment is up
shell: pwsh
timeout-minutes: 15
run: |
do {
Start-Sleep -s 15
$statusBage = (Invoke-WebRequest -Uri "https://argo.govirto.com/api/badge?name=${{ steps.deployConfig.outputs.deployAppName }}").Content
$syncedAndHealthy = $statusBage.Contains('>Healthy<') -and $statusBage.Contains('>Synced<')
if (-not $syncedAndHealthy) {
Write-Host "Sync pending..."
}
}
while (-not $syncedAndHealthy)
- name: BUILD_STATE::successful
if: success()
run: echo "BUILD_STATE=successful" >> $GITHUB_ENV

- name: BUILD_STATE::failed
if: failure()
run: echo "BUILD_STATE=failed" >> $GITHUB_ENV

- name: Update GitHub deployment status
uses: bobheadxi/deployments@master
if: always()
with:
step: finish
token: ${{ secrets.GITHUB_TOKEN }}
status: ${{ job.status }}
deployment_id: ${{ steps.deployment.outputs.deployment_id }}
Loading