@fleetbase/storefront-engine 0.3.3 → 0.3.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.php-cs-fixer.php +2 -0
- package/addon/components/modals/create-first-store.hbs +1 -1
- package/addon/components/modals/create-network.hbs +1 -1
- package/addon/components/modals/create-store.hbs +1 -1
- package/addon/components/modals/manage-addons.hbs +1 -1
- package/addon/components/modals/store-form.hbs +2 -2
- package/addon/components/storefront-order-summary.hbs +73 -0
- package/addon/components/storefront-order-summary.js +3 -0
- package/addon/components/widget/orders.js +1 -1
- package/addon/controllers/networks/index/network/index.js +5 -1
- package/addon/controllers/products/index/category/edit.js +1 -1
- package/addon/controllers/products/index/category/new.js +4 -5
- package/addon/controllers/settings/index.js +5 -1
- package/addon/engine.js +4 -0
- package/addon/templates/networks/index/network/index.hbs +1 -1
- package/addon/templates/products/index/category/new.hbs +10 -5
- package/addon/templates/settings/index.hbs +14 -4
- package/app/components/storefront-order-summary.js +1 -0
- package/composer.json +6 -4
- package/extension.json +1 -1
- package/package.json +3 -3
- package/server/migrations/2023_05_03_025307_create_carts_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_checkouts_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_gateways_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_network_stores_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_networks_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_notification_channels_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_payment_methods_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_product_addon_categories_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_product_addons_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_product_hours_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_product_store_locations_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_product_variant_options_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_product_variants_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_products_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_reviews_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_store_hours_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_store_locations_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_stores_table.php +1 -2
- package/server/migrations/2023_05_03_025307_create_votes_table.php +1 -2
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_carts_table.php +3 -4
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_checkouts_table.php +3 -4
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_gateways_table.php +3 -4
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_network_stores_table.php +3 -4
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_networks_table.php +3 -4
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_notification_channels_table.php +3 -4
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_payment_methods_table.php +3 -4
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_addon_categories_table.php +3 -4
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_addons_table.php +3 -4
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_hours_table.php +1 -2
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_store_locations_table.php +1 -2
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_variant_options_table.php +1 -2
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_product_variants_table.php +1 -2
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_products_table.php +3 -4
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_reviews_table.php +3 -4
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_store_hours_table.php +1 -2
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_store_locations_table.php +3 -4
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_stores_table.php +3 -4
- package/server/migrations/2023_05_03_025310_add_foreign_keys_to_votes_table.php +3 -4
- package/server/seeders/OrderConfigSeeder.php +270 -0
- package/server/src/Expansions/EntityExpansion.php +2 -1
- package/server/src/Http/Controllers/v1/CartController.php +0 -12
- package/server/src/Http/Controllers/v1/CheckoutController.php +37 -38
- package/server/src/Http/Resources/Network.php +1 -0
- package/server/src/Http/Resources/Store.php +1 -0
- package/server/src/Models/Cart.php +3 -11
- package/server/src/Models/Product.php +2 -5
- package/server/src/Observers/NetworkObserver.php +1 -1
- package/translations/en-us.yaml +2 -0
package/.php-cs-fixer.php
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
$finder = PhpCsFixer\Finder::create()
|
|
4
4
|
->in(__DIR__ . DIRECTORY_SEPARATOR . 'server' . DIRECTORY_SEPARATOR . 'tests')
|
|
5
|
+
->in(__DIR__ . DIRECTORY_SEPARATOR . 'server' . DIRECTORY_SEPARATOR . 'seeders')
|
|
6
|
+
->in(__DIR__ . DIRECTORY_SEPARATOR . 'server' . DIRECTORY_SEPARATOR . 'migrations')
|
|
5
7
|
->in(__DIR__ . DIRECTORY_SEPARATOR . 'server' . DIRECTORY_SEPARATOR . 'src')
|
|
6
8
|
->append(['.php-cs-fixer.php']);
|
|
7
9
|
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
@value={{@options.store.currency}}
|
|
27
27
|
@helpText={{t "storefront.component.modals.create-first-store.select-currency"}}
|
|
28
28
|
>
|
|
29
|
-
<CurrencySelect @
|
|
29
|
+
<CurrencySelect @currency={{@options.store.currency}} @onCurrencyChange={{fn (mut @options.store.currency)}} @triggerClass="w-full form-select" />
|
|
30
30
|
</InputGroup>
|
|
31
31
|
</div>
|
|
32
32
|
</div>
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
@value={{@options.network.currency}}
|
|
23
23
|
@helpText={{t "storefront.component.modals.create-network.currency-text"}}
|
|
24
24
|
>
|
|
25
|
-
<CurrencySelect @
|
|
25
|
+
<CurrencySelect @currency={{@options.network.currency}} @onCurrencyChange={{fn (mut @options.network.currency)}} @triggerClass="w-full form-select" />
|
|
26
26
|
</InputGroup>
|
|
27
27
|
</div>
|
|
28
28
|
</Modal::Default>
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
@value={{@options.store.currency}}
|
|
12
12
|
@helpText={{t "storefront.component.modals.create-store.currency-text"}}
|
|
13
13
|
>
|
|
14
|
-
<CurrencySelect @
|
|
14
|
+
<CurrencySelect @currency={{@options.store.currency}} @onCurrencyChange={{fn (mut @options.store.currency)}} @triggerClass="w-full form-select" />
|
|
15
15
|
</InputGroup>
|
|
16
16
|
</div>
|
|
17
17
|
</Modal::Default>
|
|
@@ -69,7 +69,7 @@ s<Modal::Default @onOpen={{fn this.fetchCategories @options.store}} @modalIsOpen
|
|
|
69
69
|
<div class="col-span-2">
|
|
70
70
|
<MoneyInput
|
|
71
71
|
class="w-full"
|
|
72
|
-
@currency={{
|
|
72
|
+
@currency={{@options.store.currency}}
|
|
73
73
|
@canSelectCurrency={{false}}
|
|
74
74
|
@value={{addon.price}}
|
|
75
75
|
@onFormatCompleted={{fn this.saveAddon addon}}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
@helpText={{t "storefront.component.modals.store-form.the-name-of-your-store"}}
|
|
9
9
|
/>
|
|
10
10
|
<InputGroup
|
|
11
|
-
@name={{t "storefront.common.
|
|
11
|
+
@name={{t "storefront.common.description"}}
|
|
12
12
|
@value={{@options.store.description}}
|
|
13
13
|
@placeholder={{t "storefront.component.modals.store-form.storefront-description-placeholder"}}
|
|
14
14
|
@helpText={{t "storefront.component.modals.store-form.give-your-store-brief-description"}}
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
</TagInput>
|
|
28
28
|
</InputGroup>
|
|
29
29
|
<InputGroup @name={{t "storefront.common.currency"}}>
|
|
30
|
-
<CurrencySelect @
|
|
30
|
+
<CurrencySelect @currency={{@options.store.currency}} @onCurrencyChange={{fn (mut @options.store.currency)}} @triggerClass="w-full form-select" />
|
|
31
31
|
</InputGroup>
|
|
32
32
|
|
|
33
33
|
<div class="store-boolean-settings">
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
{{#if (eq @model.type "storefront")}}
|
|
2
|
+
<ContentPanel @title={{t "storefront.component.storefront-order-summary.order-summary-title"}} @prefixTitleRight={{if @order.payload.cod_amount "Cash" ""}} @prefixTitleRightClass="text-green-400" @open={{true}} @pad={{true}} @panelBodyClass="bg-white dark:bg-gray-800">
|
|
3
|
+
<div class="flex flex-col space-y-4 p-2 overflow-hidden">
|
|
4
|
+
{{#each @order.payload.entities as |entity|}}
|
|
5
|
+
<div class="flex flex-1">
|
|
6
|
+
<div class="mr-2">
|
|
7
|
+
<div class="flex items-center justify-center w-6 h-5 border border-gray-200 dark:border-blue-400 rounded-md">
|
|
8
|
+
<span class="text-blue-400 text-xs">{{entity.meta.quantity}}x</span>
|
|
9
|
+
</div>
|
|
10
|
+
</div>
|
|
11
|
+
<div class="flex-1 flex">
|
|
12
|
+
<div class="mr-4">
|
|
13
|
+
<img src={{entity.photo_url}} class="w-12 h-12 rounded-md shadow-sm" alt={{entity.name}} />
|
|
14
|
+
</div>
|
|
15
|
+
<div>
|
|
16
|
+
<h4 class="font-semibold dark:text-gray-100 mb-1 text-sm">{{entity.name}}</h4>
|
|
17
|
+
<div class="flex flex-wrap truncate w-44">
|
|
18
|
+
<p class="dark:text-gray-50 text-xs truncate">{{entity.description}}</p>
|
|
19
|
+
</div>
|
|
20
|
+
<div>
|
|
21
|
+
{{#each entity.meta.variants as |variant|}}
|
|
22
|
+
<div>
|
|
23
|
+
<span class="text-xs dark:text-gray-50">{{variant.name}}</span>
|
|
24
|
+
</div>
|
|
25
|
+
{{/each}}
|
|
26
|
+
</div>
|
|
27
|
+
<div>
|
|
28
|
+
{{#each entity.meta.addons as |addon|}}
|
|
29
|
+
<div>
|
|
30
|
+
<span class="text-xs dark:text-gray-50">+ {{addon.name}}</span>
|
|
31
|
+
</div>
|
|
32
|
+
{{/each}}
|
|
33
|
+
</div>
|
|
34
|
+
</div>
|
|
35
|
+
</div>
|
|
36
|
+
<div>
|
|
37
|
+
<span class="dark:text-gray-50 text-sm">{{format-currency entity.meta.subtotal entity.currency}}</span>
|
|
38
|
+
</div>
|
|
39
|
+
</div>
|
|
40
|
+
{{/each}}
|
|
41
|
+
</div>
|
|
42
|
+
<div class="p-2 space-y-2 border-t border-b dark:border-gray-800">
|
|
43
|
+
<div class="flex items-center justify-between">
|
|
44
|
+
<span class="dark:text-gray-50 text-sm">{{t "fleet-ops.operations.orders.index.view.subtotal"}}</span>
|
|
45
|
+
<span class="dark:text-gray-50 text-sm">{{format-currency @order.meta.subtotal @order.meta.currency}}</span>
|
|
46
|
+
</div>
|
|
47
|
+
{{#unless @order.meta.is_pickup}}
|
|
48
|
+
<div class="flex items-center justify-between">
|
|
49
|
+
<span class="dark:text-gray-50 text-sm">{{t "fleet-ops.operations.orders.index.view.delivery-fee"}}</span>
|
|
50
|
+
<span class="dark:text-gray-50 text-sm">{{format-currency @order.meta.delivery_fee @order.meta.currency}}</span>
|
|
51
|
+
</div>
|
|
52
|
+
{{/unless}}
|
|
53
|
+
{{#if @order.meta.tip}}
|
|
54
|
+
<div class="flex items-center justify-between">
|
|
55
|
+
<span class="dark:text-gray-50 text-sm">{{t "fleet-ops.operations.orders.index.view.tip"}}</span>
|
|
56
|
+
<span class="dark:text-gray-50 text-sm">{{get-tip-amount @order.meta.tip @order.meta.subtotal @order.meta.currency}}</span>
|
|
57
|
+
</div>
|
|
58
|
+
{{/if}}
|
|
59
|
+
{{#if @order.meta.delivery_tip}}
|
|
60
|
+
<div class="flex items-center justify-between">
|
|
61
|
+
<span class="dark:text-gray-50 text-sm">{{t "fleet-ops.operations.orders.index.view.delivery-tip"}}</span>
|
|
62
|
+
<span class="dark:text-gray-50 text-sm">{{get-tip-amount @order.meta.delivery_tip @order.meta.subtotal @order.meta.currency}}</span>
|
|
63
|
+
</div>
|
|
64
|
+
{{/if}}
|
|
65
|
+
</div>
|
|
66
|
+
<div class="p-2">
|
|
67
|
+
<div class="flex items-center justify-between">
|
|
68
|
+
<span class="dark:text-gray-50 font-bold text-sm">{{t "fleet-ops.operations.orders.index.view.total"}}</span>
|
|
69
|
+
<span class="dark:text-gray-50 font-bold text-sm">{{format-currency @order.meta.total @order.meta.currency}}</span>
|
|
70
|
+
</div>
|
|
71
|
+
</div>
|
|
72
|
+
</ContentPanel>
|
|
73
|
+
{{/if}}
|
|
@@ -250,7 +250,7 @@ export default class WidgetOrdersComponent extends Component {
|
|
|
250
250
|
|
|
251
251
|
this.modalsManager.show('modals/assign-driver', {
|
|
252
252
|
title: this.intl.t('storefront.component.widget.orders.assign-driver-modal-title'),
|
|
253
|
-
acceptButtonText: this.intl.t('storefront.component.widget.orders.assign-driver-accept-button-text'),
|
|
253
|
+
acceptButtonText: this.intl.t('storefront.component.widget.orders.assign-driver-modal-accept-button-text'),
|
|
254
254
|
acceptButtonScheme: 'success',
|
|
255
255
|
acceptButtonIcon: 'check',
|
|
256
256
|
driver: order.driver_assigned,
|
|
@@ -280,6 +280,10 @@ export default class NetworksIndexNetworkIndexController extends Controller {
|
|
|
280
280
|
this.model.set('alertable', {});
|
|
281
281
|
}
|
|
282
282
|
|
|
283
|
-
|
|
283
|
+
const serializedModels = models.map((model) => {
|
|
284
|
+
return model.serialize();
|
|
285
|
+
});
|
|
286
|
+
|
|
287
|
+
this.model.set(`alertable.${reason}`, serializedModels);
|
|
284
288
|
}
|
|
285
289
|
}
|
|
@@ -23,7 +23,7 @@ export default class ProductsIndexCategoryEditController extends ProductsIndexCa
|
|
|
23
23
|
.save()
|
|
24
24
|
.then(() => {
|
|
25
25
|
this.isSaving = false;
|
|
26
|
-
this.notifications.success(this.intl.t('storefront.products.index.changes-saved'));
|
|
26
|
+
this.notifications.success(this.intl.t('storefront.products.index.edit.changes-saved'));
|
|
27
27
|
})
|
|
28
28
|
.catch((error) => {
|
|
29
29
|
this.isSaving = false;
|
|
@@ -65,8 +65,8 @@ export default class ProductsIndexCategoryNewController extends BaseController {
|
|
|
65
65
|
this.isSaving = false;
|
|
66
66
|
this.notifications.success(this.intl.t('storefront.products.index.new.new-product-created-success'));
|
|
67
67
|
|
|
68
|
-
|
|
69
|
-
|
|
68
|
+
this.transitionToRoute('products.index.category', category.slug).finally(() => {
|
|
69
|
+
this.reset();
|
|
70
70
|
});
|
|
71
71
|
})
|
|
72
72
|
.catch((error) => {
|
|
@@ -166,6 +166,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
|
|
|
166
166
|
}
|
|
167
167
|
|
|
168
168
|
@action exit(closeOverlay) {
|
|
169
|
+
console.log(closeOverlay, 'closeOverlay');
|
|
169
170
|
return closeOverlay(() => {
|
|
170
171
|
return this.transitionToRoute('products.index.category').then(() => {
|
|
171
172
|
this.reset();
|
|
@@ -185,7 +186,7 @@ export default class ProductsIndexCategoryNewController extends BaseController {
|
|
|
185
186
|
addonCategories,
|
|
186
187
|
product,
|
|
187
188
|
updateProductAddonCategories: (categories) => {
|
|
188
|
-
|
|
189
|
+
this.product.addon_categories = categories.map((category) => {
|
|
189
190
|
return this.store.createRecord('product-addon-category', {
|
|
190
191
|
product_uuid: product.id,
|
|
191
192
|
category_uuid: category.id,
|
|
@@ -194,8 +195,6 @@ export default class ProductsIndexCategoryNewController extends BaseController {
|
|
|
194
195
|
category,
|
|
195
196
|
});
|
|
196
197
|
});
|
|
197
|
-
|
|
198
|
-
product.addon_categories.pushObjects(productAddonCategories);
|
|
199
198
|
},
|
|
200
199
|
});
|
|
201
200
|
});
|
|
@@ -105,6 +105,10 @@ export default class SettingsIndexController extends Controller {
|
|
|
105
105
|
this.model.set('alertable', {});
|
|
106
106
|
}
|
|
107
107
|
|
|
108
|
-
|
|
108
|
+
const serializedModels = models.map((model) => {
|
|
109
|
+
return model.serialize();
|
|
110
|
+
});
|
|
111
|
+
|
|
112
|
+
this.model.set(`alertable.${reason}`, serializedModels);
|
|
109
113
|
}
|
|
110
114
|
}
|
package/addon/engine.js
CHANGED
|
@@ -4,6 +4,7 @@ import Resolver from 'ember-resolver';
|
|
|
4
4
|
import config from './config/environment';
|
|
5
5
|
import services from '@fleetbase/ember-core/exports/services';
|
|
6
6
|
import StorefrontKeyMetricsWidget from './components/widget/storefront-key-metrics';
|
|
7
|
+
import StorefrontOrderSummaryComponent from './components/storefront-order-summary';
|
|
7
8
|
|
|
8
9
|
const { modulePrefix } = config;
|
|
9
10
|
const externalRoutes = ['console', 'extensions'];
|
|
@@ -32,6 +33,9 @@ export default class StorefrontEngine extends Engine {
|
|
|
32
33
|
},
|
|
33
34
|
};
|
|
34
35
|
|
|
36
|
+
// register component to views
|
|
37
|
+
universe.registerRenderableComponent('@fleetbase/fleetops-engine', 'fleet-ops:template:operations:orders:view', StorefrontOrderSummaryComponent);
|
|
38
|
+
|
|
35
39
|
// register widgets
|
|
36
40
|
universe.registerDefaultDashboardWidgets([KeyMetricsWidgetDefinition]);
|
|
37
41
|
universe.registerDashboardWidgets([KeyMetricsWidgetDefinition]);
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
@helpText={{t "storefront.networks.index.network.index.general-network-settings-form.description-help-text"}}
|
|
24
24
|
/>
|
|
25
25
|
<InputGroup @name={{t "storefront.networks.index.network.index.general-network-settings-form.currency"}}>
|
|
26
|
-
<CurrencySelect @
|
|
26
|
+
<CurrencySelect @currency={{@model.currency}} @onCurrencyChange={{fn (mut @model.currency)}} @triggerClass="w-full form-select" />
|
|
27
27
|
</InputGroup>
|
|
28
28
|
|
|
29
29
|
<ContentPanel @title={{t "storefront.networks.index.network.index.general-network-settings-form.contact-social-panel.panel-title"}} @open={{false}} @pad={{true}}>
|
|
@@ -40,18 +40,18 @@
|
|
|
40
40
|
<InputGroup @name="Price" @helpText="Enter a price users will pay to purchase this product">
|
|
41
41
|
<MoneyInput
|
|
42
42
|
class="w-full"
|
|
43
|
-
@currency={{this.product.currency}}
|
|
43
|
+
@currency={{if this.product.currency this.product.currency this.activeStore.currency}}
|
|
44
44
|
@value={{this.product.price}}
|
|
45
|
-
@canSelectCurrency={{
|
|
45
|
+
@canSelectCurrency={{false}}
|
|
46
46
|
@onCurrencyChange={{fn (mut this.product.currency)}}
|
|
47
47
|
/>
|
|
48
48
|
</InputGroup>
|
|
49
49
|
<InputGroup @name="Sale Price" @helpText="Optionally add a sale price for the product if the product is put on sale">
|
|
50
50
|
<MoneyInput
|
|
51
51
|
class="w-full"
|
|
52
|
-
@currency={{this.product.currency}}
|
|
52
|
+
@currency={{if this.product.currency this.product.currency this.activeStore.currency}}
|
|
53
53
|
@value={{this.product.sale_price}}
|
|
54
|
-
@canSelectCurrency={{
|
|
54
|
+
@canSelectCurrency={{false}}
|
|
55
55
|
@onCurrencyChange={{fn (mut this.product.currency)}}
|
|
56
56
|
/>
|
|
57
57
|
</InputGroup>
|
|
@@ -144,7 +144,12 @@
|
|
|
144
144
|
<Input @type="text" @value={{variantOption.description}} class="form-input w-full" placeholder="Option Description" />
|
|
145
145
|
</div>
|
|
146
146
|
<div class="col-span-2">
|
|
147
|
-
<MoneyInput
|
|
147
|
+
<MoneyInput
|
|
148
|
+
class="w-full"
|
|
149
|
+
@currency={{if this.product.currency this.product.currency this.activeStore.currency}}
|
|
150
|
+
@canSelectCurrency={{false}}
|
|
151
|
+
@value={{variantOption.additional_cost}}
|
|
152
|
+
/>
|
|
148
153
|
</div>
|
|
149
154
|
<div class="flex items-center justify-center text-center text-sm">
|
|
150
155
|
<a href="javascript:;" {{on "click" (fn this.removeVariantOption variant index)}}>Remove</a>
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
</TagInput>
|
|
38
38
|
</InputGroup>
|
|
39
39
|
<InputGroup @name={{t "storefront.common.currency"}}>
|
|
40
|
-
<CurrencySelect @
|
|
40
|
+
<CurrencySelect @currency={{@model.currency}} @onCurrencyChange={{fn (mut @model.currency)}} @triggerClass="w-full form-select" />
|
|
41
41
|
</InputGroup>
|
|
42
42
|
|
|
43
43
|
<ContentPanel @title={{t "storefront.settings.index.contact-social"}} @open={{false}} @pad={{true}}>
|
|
@@ -114,7 +114,13 @@
|
|
|
114
114
|
</InputGroup>
|
|
115
115
|
</ContentPanel>
|
|
116
116
|
|
|
117
|
-
<ContentPanel
|
|
117
|
+
<ContentPanel
|
|
118
|
+
@title={{t "storefront.settings.index.images-videos"}}
|
|
119
|
+
@open={{false}}
|
|
120
|
+
@pad={{false}}
|
|
121
|
+
@panelBodyWrapperClass="px-0 py-4"
|
|
122
|
+
@panelBodyClass="bg-white dark:bg-gray-800"
|
|
123
|
+
>
|
|
118
124
|
<div class="p-6">
|
|
119
125
|
{{#if this.isUploading}}
|
|
120
126
|
<div
|
|
@@ -239,7 +245,9 @@
|
|
|
239
245
|
</div>
|
|
240
246
|
<div class="input-group">
|
|
241
247
|
<Toggle @isToggled={{@model.options.auto_accept_orders}} @onToggle={{fn (mut @model.options.auto_accept_orders)}}>
|
|
242
|
-
<FaIcon @icon="robot" class="text-gray-600 dark:text-gray-400 mx-2" /><span class="dark:text-gray-100 text-sm">{{t
|
|
248
|
+
<FaIcon @icon="robot" class="text-gray-600 dark:text-gray-400 mx-2" /><span class="dark:text-gray-100 text-sm">{{t
|
|
249
|
+
"storefront.settings.index.auto-accept-incoming-order"
|
|
250
|
+
}}</span>
|
|
243
251
|
</Toggle>
|
|
244
252
|
</div>
|
|
245
253
|
<div class="input-group">
|
|
@@ -251,7 +259,9 @@
|
|
|
251
259
|
</div>
|
|
252
260
|
<div class="input-group">
|
|
253
261
|
<Toggle @isToggled={{@model.options.require_pod}} @onToggle={{fn (mut @model.options.require_pod)}}>
|
|
254
|
-
<FaIcon @icon="signature" class="text-gray-600 dark:text-gray-400 mx-2" /><span class="dark:text-gray-100 text-sm">{{t
|
|
262
|
+
<FaIcon @icon="signature" class="text-gray-600 dark:text-gray-400 mx-2" /><span class="dark:text-gray-100 text-sm">{{t
|
|
263
|
+
"storefront.settings.index.require-proof-of-delivery"
|
|
264
|
+
}}</span>
|
|
255
265
|
</Toggle>
|
|
256
266
|
{{#if @model.options.require_pod}}
|
|
257
267
|
<InputGroup @wrapperClass="mb-0 mt-2" @name={{t "storefront.settings.index.proof-of-delivery-method"}}>
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { default } from '@fleetbase/storefront-engine/components/storefront-order-summary';
|
package/composer.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "fleetbase/storefront-api",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.4",
|
|
4
4
|
"description": "Headless Commerce & Marketplace Extension for Fleetbase",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"fleetbase-extension",
|
|
@@ -22,8 +22,8 @@
|
|
|
22
22
|
],
|
|
23
23
|
"require": {
|
|
24
24
|
"php": "^8.0",
|
|
25
|
-
"fleetbase/core-api": "^1.4.
|
|
26
|
-
"fleetbase/fleetops-api": "^0.4.
|
|
25
|
+
"fleetbase/core-api": "^1.4.11",
|
|
26
|
+
"fleetbase/fleetops-api": "^0.4.17",
|
|
27
27
|
"geocoder-php/google-maps-places-provider": "^1.4",
|
|
28
28
|
"laravel-notification-channels/apn": "^5.0",
|
|
29
29
|
"laravel-notification-channels/fcm": "^4.1",
|
|
@@ -31,6 +31,7 @@
|
|
|
31
31
|
"milon/barcode": "^10.0",
|
|
32
32
|
"php-http/guzzle7-adapter": "^1.0",
|
|
33
33
|
"psr/http-factory-implementation": "*",
|
|
34
|
+
"stripe/stripe-php": "13.13.0",
|
|
34
35
|
"toin0u/geocoder-laravel": "^4.4"
|
|
35
36
|
},
|
|
36
37
|
"require-dev": {
|
|
@@ -42,7 +43,8 @@
|
|
|
42
43
|
},
|
|
43
44
|
"autoload": {
|
|
44
45
|
"psr-4": {
|
|
45
|
-
"Fleetbase\\Storefront\\": "server/src/"
|
|
46
|
+
"Fleetbase\\Storefront\\": "server/src/",
|
|
47
|
+
"Fleetbase\\Storefront\\Seeders\\": "seeders/"
|
|
46
48
|
}
|
|
47
49
|
},
|
|
48
50
|
"autoload-dev": {
|
package/extension.json
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fleetbase/storefront-engine",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.4",
|
|
4
4
|
"description": "Headless Commerce & Marketplace Extension for Fleetbase",
|
|
5
5
|
"fleetbase": {
|
|
6
6
|
"route": "storefront",
|
|
@@ -43,9 +43,9 @@
|
|
|
43
43
|
"publish:github": "npm config set '@fleetbase:registry' https://npm.pkg.github.com/ && npm publish"
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"@fleetbase/ember-core": "^0.2.
|
|
46
|
+
"@fleetbase/ember-core": "^0.2.5",
|
|
47
47
|
"@fleetbase/ember-ui": "^0.2.11",
|
|
48
|
-
"@fleetbase/fleetops-data": "^0.1.
|
|
48
|
+
"@fleetbase/fleetops-data": "^0.1.12",
|
|
49
49
|
"@babel/core": "^7.23.2",
|
|
50
50
|
"@fortawesome/ember-fontawesome": "^0.4.1",
|
|
51
51
|
"@fortawesome/fontawesome-svg-core": "^6.4.0",
|