M-Labs
/
web2019
5
0
Fork 2
Code Issues 20 Pull Requests 3 Releases Wiki Activity

Add options for the cards #93

Merged
sb10q merged 42 commits from esavkin/web2019:85-variants into master 2023-11-28 15:32:34 +08:00
Conversation 24 Commits 42 Files Changed 9 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1a0b613044 - Show all commits

3
static/js/shop.jsx
View File

@ -2070,6 +2070,7 @@ class Shop extends React.PureComponent {
if (idx in this.state.columns.cart.itemsData && this.state.columns.cart.itemsData[idx].options_data) { if (idx in this.state.columns.cart.itemsData && this.state.columns.cart.itemsData[idx].options_data) {
itemsCloned[idx].options_data = this.state.columns.cart.itemsData[idx].options_data; itemsCloned[idx].options_data = this.state.columns.cart.itemsData[idx].options_data;
} }
itemsData[idx].warnings = {};
}); });
@ -2225,7 +2226,7 @@ class Shop extends React.PureComponent {
}, 0); }, 0);
if (idx in itemsData) { if (idx in itemsData) {
if (itemsData[idx].nbrCurrentClock) { if (itemsData[idx].nbrCurrentClock && itemsData[idx].type !== "clocker") {
itemsData[idx].nbrCurrentClock += nbrCurrentClock; itemsData[idx].nbrCurrentClock += nbrCurrentClock;
} else { } else {
itemsData[idx].nbrCurrentClock = nbrCurrentClock; itemsData[idx].nbrCurrentClock = nbrCurrentClock;