Skip to content

Commit

Permalink
Pushing changes made in Sprint 15, version 9.0.1.8
Browse files Browse the repository at this point in the history
- Display Active Promotion on the PDP
- Improved Responsive UI
- Added publishing workflow
  - e-mail notifications to approver role
  - publishing / approver demo user ( pete / p)
- Fixed bugs
- Disable Live mode
- Fix checkout bug
  • Loading branch information
jeanfrancoislarente committed Jun 12, 2018
1 parent bf03a84 commit a280318
Show file tree
Hide file tree
Showing 216 changed files with 4,397 additions and 1,130 deletions.
20 changes: 20 additions & 0 deletions HabitatHome.Commerce.sln
Expand Up @@ -116,6 +116,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugin.Sample.Upgrade", "sr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sitecore.Commerce.ServiceProxy", "src\Foundation\Commerce\website\Sitecore.Commerce.ServiceProxy\Sitecore.Commerce.ServiceProxy.csproj", "{0F78AB49-26E0-4DB8-B654-7878EDEF546D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ActivePromotion", "ActivePromotion", "{054C0EDB-3E7C-4CF6-8B85-7D6F55397147}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.HabitatHome.Feature.ActivePromotion.Website", "src\Feature\ActivePromotion\website\Sitecore.HabitatHome.Feature.ActivePromotion.Website.csproj", "{EFF50A81-0722-4537-892D-F0522495BFD6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Promotions", "Promotions", "{F11F18D0-C25F-4130-8320-DDE62AA33EDB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sitecore.HabitatHome.Foundation.Promotions.Website", "src\Foundation\Promotions\website\Sitecore.HabitatHome.Foundation.Promotions.Website.csproj", "{A5FE2C5D-8A6F-4ACF-9F4F-03B7F8F7F94F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -220,6 +228,14 @@ Global
{0F78AB49-26E0-4DB8-B654-7878EDEF546D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0F78AB49-26E0-4DB8-B654-7878EDEF546D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0F78AB49-26E0-4DB8-B654-7878EDEF546D}.Release|Any CPU.Build.0 = Release|Any CPU
{EFF50A81-0722-4537-892D-F0522495BFD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EFF50A81-0722-4537-892D-F0522495BFD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EFF50A81-0722-4537-892D-F0522495BFD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EFF50A81-0722-4537-892D-F0522495BFD6}.Release|Any CPU.Build.0 = Release|Any CPU
{A5FE2C5D-8A6F-4ACF-9F4F-03B7F8F7F94F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A5FE2C5D-8A6F-4ACF-9F4F-03B7F8F7F94F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A5FE2C5D-8A6F-4ACF-9F4F-03B7F8F7F94F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A5FE2C5D-8A6F-4ACF-9F4F-03B7F8F7F94F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -274,6 +290,10 @@ Global
{4CDE6F12-6BBA-48BE-B967-30EAB5BCE229} = {B5F21741-0DE5-41E3-BB6B-BD7362D1691F}
{BB866539-286D-4CC7-99FA-CF1FC2750B47} = {B5F21741-0DE5-41E3-BB6B-BD7362D1691F}
{0F78AB49-26E0-4DB8-B654-7878EDEF546D} = {B5F21741-0DE5-41E3-BB6B-BD7362D1691F}
{054C0EDB-3E7C-4CF6-8B85-7D6F55397147} = {05829E0F-331A-44AF-BEB8-3AD54EE35694}
{EFF50A81-0722-4537-892D-F0522495BFD6} = {054C0EDB-3E7C-4CF6-8B85-7D6F55397147}
{F11F18D0-C25F-4130-8320-DDE62AA33EDB} = {1B6FFBEA-35BD-4381-A2BE-4FA54E3940E1}
{A5FE2C5D-8A6F-4ACF-9F4F-03B7F8F7F94F} = {F11F18D0-C25F-4130-8320-DDE62AA33EDB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {092E4BB9-63E2-476F-91D9-389412140FC4}
Expand Down
16 changes: 6 additions & 10 deletions README.md
Expand Up @@ -18,6 +18,8 @@ The code, samples and/or solutions provided in this repository are for example p

# Getting Started

**This guide assumes you've cloned and deployed Sitecore.HabitatHome.Content. See the README.md file in the [Sitecore.HabitatHome.Content](https://github.com/sitecore/sitecore.habitathome.content) repository.**

## Prerequisites

### Sitecore Version
Expand All @@ -26,15 +28,9 @@ Prior to attempting the demo installation, ensure you have a working **Sitecore

You do not need to install the Storefront Theme

### Sitecore.HabitatHome.Content

**This guide assumes you've cloned and deployed Sitecore.HabitatHome.Content.** See the README.md file in the [Sitecore.HabitatHome.Content](https://github.com/sitecore/sitecore.habitathome.content) repository.


## Installation
**All installation instructions assume using PowerShell 5.1 in administrative mode.**
**Clone this repository**

### Custom Install - before you start
## Custom Install - before you start

If you do **not want to use the default settings**, you need to adjust the appropriate values in the following files:

Expand All @@ -44,9 +40,10 @@ If you do **not want to use the default settings**, you need to adjust the appro

Note: If you've already deployed the HabitatHome Content demo, and you wish to run the HabitatHome Commerce demo in a new instance by customizing these sttings,
you would need to also customize the settings in the HabitatHome Content demo and deploy it to the new instance **before** deploying HabitatHome Commerce.

See README.md in Sitecore.HabitatHome.Content for custom settings.

## Installation
**All installation instructions assume using PowerShell 5.1 in administrative mode.**

### 1 Clone the Repository
Clone the Sitecore.HabitatHome.Commerce repository locally - default settings assume **`C:\Projects\Sitecore.HabitatHome.Commerce`**.
Expand All @@ -72,7 +69,6 @@ _Notes:_
* If you want to use your own engine suffix rather than `habitat`, you need to update it in `deploy-commerce-engine.ps1`
* If you want to use your own databases rather than `habitat_Global`, you need to update it in `\src\Project\HabitatHome\engine\wwwroot\bootstrap\Global.json`
* If you want to use your own databases rather than `habitat_SharedEnvironments`, you need to update it in `\src\Project\HabitatHome\engine\wwwroot\data\Environments\Plugin.SQL.PolicySet-1.0.0.json`

The script is provided as an example and should be reviewed to understand its behavior prior to its execution. In summary, the script:

- Compiles and publishes the engine to a temporary location (default .\publishTemp)
Expand Down
2 changes: 1 addition & 1 deletion deploy-commerce-engine.ps1
Expand Up @@ -202,4 +202,4 @@ if ($Bootstrap) {
if ($Initialize) {
CleanEnvironment
InitializeCommerceServices
}
}
4 changes: 4 additions & 0 deletions docs/features/store-inventory.md
@@ -0,0 +1,4 @@
# Feature: Store Inventory

### How to Create Store Inventory Sets using JSON

39 changes: 39 additions & 0 deletions docs/sample-data/orders/PostmanOfflineOrder.json
@@ -0,0 +1,39 @@
{
"Order": {
"OrderPlacedDate": "2018-02-14T22:32:41.5332063+00:00",
"OrderConfirmationId": "610003123232",
"Email": "prasa@gmail.com",
"Language": "en-US",
"Status": "StoreOrder",
"Lines": [
{
"ItemId": "Habitat_Master|7042121|57042121",
"Quantity": 1.0,
"ProductName": "Optix 12.8MP 4K Ultra HD Action Camera (White)",
"UnitListPrice": 429.99,
"SubTotal": 429.99

}
],
"CurrencyCode": "USD",
"SubTotal": 429.99,
"GrandTotal": 460.99,
"TaxTotal": 34,
"Discount": 3,
"CardType": "Visa",
"PaymentInstrumentType": "credit_card",
"TransactionStatus": "authorized",
"TransactionId": "ejcg6vky",
"MaskedNumber": "3321",
"ExpiresMonth": 10,
"ExpiresYear": 2020,
"StoreDetails": {
"Name": "Sacramento Store",
"Address": "926 Marshall Dr.",
"City": "Sacramento",
"State": "CA",
"ZipCode": "95814",
"Country": "US"
}
}
}
115 changes: 115 additions & 0 deletions docs/sample-data/orders/SampleUploadOrdersMultiple.json
@@ -0,0 +1,115 @@
{
"Order": [
{
"OrderPlacedDate": "2018-02-14T22:32:41.5332063+00:00",
"OrderConfirmationId": "509",
"Email": "prasad@gmail.com",
"Language": "en-US",
"Status": "StoreOrder",
"Lines": [
{
"ItemId": "Habitat_Master|7042121|57042121",
"Quantity": 1.0,
"ProductName": "Optix 12.8MP 4K Ultra HD Action Camera (White)",
"UnitListPrice": 429.99,
"SubTotal": 429.99

}
],
"CurrencyCode": "USD",
"SubTotal": 429.99,
"GrandTotal": 460.99,
"TaxTotal": 34,
"Discount": 3,
"CardType": "Visa",
"PaymentInstrumentType": "credit_card",
"TransactionStatus": "authorized",
"TransactionId": "ejcg6vky",
"MaskedNumber": "3321",
"ExpiresMonth": 10,
"ExpiresYear": 2020,
"StoreDetails": {
"Name": "Sacramento Store",
"Address": "926 Marshall Dr.",
"City": "Sacramento",
"State": "CA",
"ZipCode": "95814",
"Country": "US"
}
},
{
"OrderPlacedDate": "2018-02-14T22:32:41.5332063+00:00",
"OrderConfirmationId": "510",
"Email": "prasa@gmail.com",
"Language": "en-US",
"Status": "StoreOrder",
"Lines": [
{
"ItemId": "Habitat_Master|7042121|57042121",
"Quantity": 1.0,
"ProductName": "Optix 12.8MP 4K Ultra HD Action Camera (White)",
"UnitListPrice": 429.99,
"SubTotal": 429.99

}
],
"CurrencyCode": "USD",
"SubTotal": 429.99,
"GrandTotal": 460.99,
"TaxTotal": 34,
"Discount": 3,
"CardType": "Visa",
"PaymentInstrumentType": "credit_card",
"TransactionStatus": "authorized",
"TransactionId": "ejcg6vky",
"MaskedNumber": "3321",
"ExpiresMonth": 10,
"ExpiresYear": 2020,
"StoreDetails": {
"Name": "Sacramento Store",
"Address": "926 Marshall Dr.",
"City": "Sacramento",
"State": "CA",
"ZipCode": "95814",
"Country": "US"
}
},
{
"OrderPlacedDate": "2018-02-14T22:32:41.5332063+00:00",
"OrderConfirmationId": "511",
"Email": "prasadkp@gmail.com",
"Language": "en-US",
"Status": "StoreOrder",
"Lines": [
{
"ItemId": "Habitat_Master|7042121|57042121",
"Quantity": 1.0,
"ProductName": "Optix 12.8MP 4K Ultra HD Action Camera (White)",
"UnitListPrice": 429.99,
"SubTotal": 429.99

}
],
"CurrencyCode": "USD",
"SubTotal": 429.99,
"GrandTotal": 460.99,
"TaxTotal": 34,
"Discount": 3,
"CardType": "Visa",
"PaymentInstrumentType": "credit_card",
"TransactionStatus": "authorized",
"TransactionId": "ejcg6vky",
"MaskedNumber": "3321",
"ExpiresMonth": 10,
"ExpiresYear": 2020,
"StoreDetails": {
"Name": "Phoenix Store",
"Address": "785 W. Fairfield Lane",
"City": "Phoenix",
"State": "AZ",
"ZipCode": "85001",
"Country": "US"
}
}
]
}
41 changes: 41 additions & 0 deletions docs/sample-data/orders/SampleUploadSingleOrder.json
@@ -0,0 +1,41 @@
{
"Order": [
{
"OrderPlacedDate": "2018-02-14T22:32:41.5332063+00:00",
"OrderConfirmationId": "509",
"Email": "prasad@gmail.com",
"Language": "en-US",
"Status": "StoreOrder",
"Lines": [
{
"ItemId": "Habitat_Master|7042121|57042121",
"Quantity": 1.0,
"ProductName": "Optix 12.8MP 4K Ultra HD Action Camera (White)",
"UnitListPrice": 429.99,
"SubTotal": 429.99

}
],
"CurrencyCode": "USD",
"SubTotal": 429.99,
"GrandTotal": 460.99,
"TaxTotal": 34,
"Discount": 3,
"CardType": "Visa",
"PaymentInstrumentType": "credit_card",
"TransactionStatus": "authorized",
"TransactionId": "ejcg6vky",
"MaskedNumber": "3321",
"ExpiresMonth": 10,
"ExpiresYear": 2020,
"StoreDetails": {
"Name": "Sacramento Store",
"Address": "926 Marshall Dr.",
"City": "Sacramento",
"State": "CA",
"ZipCode": "95814",
"Country": "US"
}
}
]
}

0 comments on commit a280318

Please sign in to comment.