diff --git a/zero.Debug/Controllers/TestController.cs b/zero.Debug/Controllers/TestController.cs index 0b15e0da..d56ea36b 100644 --- a/zero.Debug/Controllers/TestController.cs +++ b/zero.Debug/Controllers/TestController.cs @@ -9,6 +9,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using zero.Commerce.Api; +using zero.Commerce.Depots.Providers.Bits; using zero.Commerce.Entities; using zero.Core.Api; using zero.Core.Entities; @@ -89,6 +90,17 @@ namespace zero.Debug.Controllers public IActionResult SaveTest([FromBody] IPage model) => Json(model); + [HttpPost] + public async Task TestBitsIntegration([FromBody] BitsSettings settings, [FromServices] BitsDepotProvider provider) + { + provider.Set(settings); + return Json(await provider.Run(new Commerce.Depots.DepotOperation() + { + AppId = "applications.1-A" + })); + } + + [HttpGet] diff --git a/zero.Debug/TestData/TestPlugin.cs b/zero.Debug/TestData/TestPlugin.cs index 2bc2b332..556ee9b7 100644 --- a/zero.Debug/TestData/TestPlugin.cs +++ b/zero.Debug/TestData/TestPlugin.cs @@ -8,6 +8,7 @@ using zero.Core.Extensions; using zero.Debug.Sync; using zero.Debug.TestData; using zero.Core.Messages; +using zero.Commerce.Depots.Providers.Bits; namespace zero.TestData { @@ -59,6 +60,7 @@ namespace zero.TestData //services.AddTransient(); // TODO auto-register handlers //services.AddTransient(); services.AddTransient(); + services.AddTransient(); } } } diff --git a/zero.Debug/zero.Debug.csproj b/zero.Debug/zero.Debug.csproj index c265bdad..d574abdc 100644 --- a/zero.Debug/zero.Debug.csproj +++ b/zero.Debug/zero.Debug.csproj @@ -5,6 +5,7 @@ + diff --git a/zero.Web.UI/App/router.config.js b/zero.Web.UI/App/router.config.js index afe89f0a..3f76d05c 100644 --- a/zero.Web.UI/App/router.config.js +++ b/zero.Web.UI/App/router.config.js @@ -110,7 +110,7 @@ addRoutesPerContext(require.context('zero/pages', true, /routes\.js$/)); // add plugin route extensions try { - addRoutesPerContext(require.context('@/../zero.Commerce/Plugins/zero.Commerce', true, /routes\.js$/), true); // TODO dynPATH + addRoutesPerContext(require.context('@/../commerce/zero.Commerce/Plugins/zero.Commerce', true, /routes\.js$/), true); // TODO dynPATH } catch (exc) { diff --git a/zero.Web.UI/App/zero.plugins.js b/zero.Web.UI/App/zero.plugins.js index 0bc28b80..229013a4 100644 --- a/zero.Web.UI/App/zero.plugins.js +++ b/zero.Web.UI/App/zero.plugins.js @@ -2,7 +2,7 @@ zero.plugins = zero.plugins || []; // TODO correct path -let plugins = require.context('@/../zero.Commerce/Plugins/zero.Commerce', true, /plugin\.js$/); // TODO dynPATH +let plugins = require.context('@/../commerce/zero.Commerce/Plugins/zero.Commerce', true, /plugin\.js$/); // TODO dynPATH plugins.keys().forEach(path => { diff --git a/zero.Web.UI/webpack.config.js b/zero.Web.UI/webpack.config.js index a69ca13b..e0f6de2b 100644 --- a/zero.Web.UI/webpack.config.js +++ b/zero.Web.UI/webpack.config.js @@ -30,7 +30,7 @@ module.exports = { 'zero': path.join(__dirname, 'App'), 'zerosetup': path.join(__dirname, 'Setup'), '@': __dirname, - 'shop': path.join(__dirname, '..', 'zero.Commerce/Plugins/zero.Commerce') // TODO dynPATH + 'shop': path.join(__dirname, '..', 'commerce/zero.Commerce/Plugins/zero.Commerce') // TODO dynPATH } }, diff --git a/zero.Web/ZeroVue.cs b/zero.Web/ZeroVue.cs index 521dd25e..d12095a0 100644 --- a/zero.Web/ZeroVue.cs +++ b/zero.Web/ZeroVue.cs @@ -235,7 +235,7 @@ namespace zero.Web Dictionary CreateTranslations() { var zeroTranslations = CreateTranslationsForFile("O:/zero/zero.Web/Resources/Localization/zero.en-us.json"); // TODO - var commerceTranslations = CreateTranslationsForFile("O:/zero/zero.Commerce/Resources/Localization/zero.commerce.en-us.json"); + var commerceTranslations = CreateTranslationsForFile("O:/zero/commerce/zero.Commerce/Resources/Localization/zero.commerce.en-us.json"); foreach (var translation in commerceTranslations) {