ordering-components-external 13.2.0 → 13.2.1
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/_bundles/{7.ordering-component.777ac76c92b69a69c827.js → 7.ordering-component.ede8de0eb9f9a2b40bec.js} +1 -1
- package/_bundles/{ordering-component.777ac76c92b69a69c827.js → ordering-component.ede8de0eb9f9a2b40bec.js} +2 -2
- package/_modules/components/OrderList/index.js +18 -6
- package/package.json +1 -1
- package/src/components/OrderList/index.js +22 -8
- /package/_bundles/{0.ordering-component.777ac76c92b69a69c827.js → 0.ordering-component.ede8de0eb9f9a2b40bec.js} +0 -0
- /package/_bundles/{1.ordering-component.777ac76c92b69a69c827.js → 1.ordering-component.ede8de0eb9f9a2b40bec.js} +0 -0
- /package/_bundles/{2.ordering-component.777ac76c92b69a69c827.js → 2.ordering-component.ede8de0eb9f9a2b40bec.js} +0 -0
- /package/_bundles/{4.ordering-component.777ac76c92b69a69c827.js → 4.ordering-component.ede8de0eb9f9a2b40bec.js} +0 -0
- /package/_bundles/{5.ordering-component.777ac76c92b69a69c827.js → 5.ordering-component.ede8de0eb9f9a2b40bec.js} +0 -0
- /package/_bundles/{6.ordering-component.777ac76c92b69a69c827.js → 6.ordering-component.ede8de0eb9f9a2b40bec.js} +0 -0
- /package/_bundles/{7.ordering-component.777ac76c92b69a69c827.js.LICENSE.txt → 7.ordering-component.ede8de0eb9f9a2b40bec.js.LICENSE.txt} +0 -0
- /package/_bundles/{8.ordering-component.777ac76c92b69a69c827.js → 8.ordering-component.ede8de0eb9f9a2b40bec.js} +0 -0
- /package/_bundles/{ordering-component.777ac76c92b69a69c827.js.LICENSE.txt → ordering-component.ede8de0eb9f9a2b40bec.js.LICENSE.txt} +0 -0
|
@@ -347,13 +347,25 @@ var OrderList = exports.OrderList = function OrderList(props) {
|
|
|
347
347
|
}
|
|
348
348
|
if (noGiftCardOrders) {
|
|
349
349
|
searchConditions.push({
|
|
350
|
-
|
|
350
|
+
conector: 'OR',
|
|
351
351
|
conditions: [{
|
|
352
|
-
attribute: '
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
value:
|
|
356
|
-
|
|
352
|
+
attribute: 'products',
|
|
353
|
+
conditions: [{
|
|
354
|
+
attribute: 'type',
|
|
355
|
+
value: {
|
|
356
|
+
condition: '=',
|
|
357
|
+
value: 'item'
|
|
358
|
+
}
|
|
359
|
+
}]
|
|
360
|
+
}, {
|
|
361
|
+
attribute: 'products',
|
|
362
|
+
conditions: [{
|
|
363
|
+
attribute: 'type',
|
|
364
|
+
value: {
|
|
365
|
+
condition: '=',
|
|
366
|
+
value: 'service'
|
|
367
|
+
}
|
|
368
|
+
}]
|
|
357
369
|
}]
|
|
358
370
|
});
|
|
359
371
|
}
|
package/package.json
CHANGED
|
@@ -158,14 +158,28 @@ export const OrderList = props => {
|
|
|
158
158
|
}
|
|
159
159
|
if (noGiftCardOrders) {
|
|
160
160
|
searchConditions.push({
|
|
161
|
-
|
|
162
|
-
conditions: [
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
161
|
+
conector: 'OR',
|
|
162
|
+
conditions: [
|
|
163
|
+
{
|
|
164
|
+
attribute: 'products',
|
|
165
|
+
conditions: [{
|
|
166
|
+
attribute: 'type',
|
|
167
|
+
value: {
|
|
168
|
+
condition: '=',
|
|
169
|
+
value: 'item'
|
|
170
|
+
}
|
|
171
|
+
}]
|
|
172
|
+
},
|
|
173
|
+
{
|
|
174
|
+
attribute: 'products',
|
|
175
|
+
conditions: [{
|
|
176
|
+
attribute: 'type',
|
|
177
|
+
value: {
|
|
178
|
+
condition: '=',
|
|
179
|
+
value: 'service'
|
|
180
|
+
}
|
|
181
|
+
}]
|
|
182
|
+
}]
|
|
169
183
|
})
|
|
170
184
|
}
|
|
171
185
|
if (searchConditions.length) {
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|