231801_test_to_master #1519

Merged
alexm merged 490 commits from 231801_test_to_master into master 2023-05-12 06:29:59 +00:00
3 changed files with 14 additions and 3 deletions
Showing only changes of commit fb1b39da17 - Show all commits

View File

@ -87,7 +87,7 @@ module.exports = Self => {
await targetItem.updateAttributes({
minPrice: args.minPrice,
hasMinPrice: args.hasMinPrice
hasMinPrice: args.hasMinPrice ? args.hasMinPrice : false
}, myOptions);
const itemFields = [

View File

@ -64,6 +64,7 @@
<tr ng-repeat="price in prices">
<td shrink-field>
<vn-autocomplete
vn-id="itemFk"
class="dense"
url="Items/withName"
ng-model="price.itemFk"
@ -88,7 +89,7 @@
ng-if="price.itemFk"
ng-click="itemDescriptor.show($event, price.itemFk)"
class="link">
{{price.name}}
{{itemFk.selection.name}}
</span>
<vn-one ng-if="price.subName">
<h3 title="{{price.subName}}">{{price.subName}}</h3>

View File

@ -36,7 +36,17 @@ export default class Controller extends Section {
if (!this.$.model.data || this.$.model.data.length == 0) {
this.$.model.data = [];
this.$.model.proxiedData = [];
this.$.model.insert({});
const today = Date.vnNew();
const millisecsInDay = 86400000;
const daysInWeek = 7;
const nextWeek = new Date(today.getTime() + daysInWeek * millisecsInDay);
this.$.model.insert({
started: today,
ended: nextWeek
});
return;
}