diff --git a/static/js/shop.jsx b/static/js/shop.jsx index b4e208e..013451a 100644 --- a/static/js/shop.jsx +++ b/static/js/shop.jsx @@ -708,23 +708,14 @@ class ProductCartItem extends React.PureComponent { big={data.size === "big"} target={{ construct: ((outvar, value) => { - console.log("construct", outvar, value, options_data); + // console.log("construct", outvar, value, options_data); options_data[outvar] = value; this.setState(options_data); }), update: ((outvar, value) => { - console.log("update", outvar, value, options_data); + // console.log("update", outvar, value, options_data); if (outvar in options_data) options_data[outvar] = value; this.setState(options_data); - }), - unmount: ((outvar) => { - console.log("delete", outvar); - //let opt_data = this.state; - //delete opt_data[outvar]; - //this.setState(opt_data); - // TODO this needs to be stopped when the whole card getting unmounted - //if (this.state.alive) - // delete options_data[outvar]; }) }} />) : null) } @@ -1442,9 +1433,6 @@ class OrderSumary extends React.PureComponent { } options = itemsData[index] && itemsData[index].options; options_data = itemsData[index] && itemsData[index].options_data; - let options_data_clone = Object.assign({}, options_data) - let display_options = FilterOptions(options, options_data_clone); // TODO fix faulty display - console.log(options, options_data, display_options) return ( ) : ( (options && options_data) ? - ( ) : null + ( ) : null )} {(!warning && !options) && ( @@ -1728,7 +1716,6 @@ class Shop extends React.PureComponent { } handleDeleteItem(index) { - console.log(this.state.columns.cart.items) let cloned = Array.from(this.state.columns.cart.items); let cloned_data = Array.from(this.state.columns.cart.itemsData); cloned.splice(index, 1); @@ -1851,7 +1838,7 @@ class Shop extends React.PureComponent { const item_data = clonedCartData[i]; crate.items.push({ 'pn': item.name_number, - 'options': (item_data.options_data && item_data.options) ? FilterOptions(item_data.options, item_data.options_data) : null, // TODO + 'options': (item_data.options_data && item_data.options) ? FilterOptions(item_data.options, item_data.options_data) : null, }); } @@ -1936,7 +1923,7 @@ class Shop extends React.PureComponent { const item_data = clonedCartData[i]; crate.items.push({ 'pn': item.name_number, - 'options': item_data.options_data ? item_data.options_data : null, + 'options': (item_data.options_data && item_data.options) ? FilterOptions(item_data.options, item_data.options_data) : null, }); } diff --git a/static/js/shop_components.jsx b/static/js/shop_components.jsx index beaadd4..18b48ce 100644 --- a/static/js/shop_components.jsx +++ b/static/js/shop_components.jsx @@ -336,7 +336,6 @@ export function ProcessOptions({options, data, target, id}) { export function FilterOptions(options, data) { let options_t = trueTypeOf(options); let target = {}; - console.log(options, data); if (options_t === "array") { options.map((option_item, _) => { @@ -348,7 +347,6 @@ export function FilterOptions(options, data) { (trueTypeOf(options.args) === "object" || trueTypeOf(options.items) === "array") ) { if (options.type in componentsList) { - console.log(options.args.outvar, data[options.args.outvar], data); target[options.args.outvar] = data[options.args.outvar]; } else if (options.type === "Group") { Object.assign(target, FilterOptions(jsonLogic.apply(options.items, data), data)) @@ -357,7 +355,6 @@ export function FilterOptions(options, data) { Object.assign(target, FilterOptions(jsonLogic.apply(options, data), data)) } } - console.log(target) return target } @@ -391,10 +388,11 @@ export function OptionsDialogPopup({options, data, target, id, big}) { ); } -export function OptionsSummaryPopup({id, data}) { +export function OptionsSummaryPopup({id, options, data}) { const [show, setShow] = useState(false); const [position, setPosition] = useState({x: 0, y: 0}); const [size, setSize] = useState({w: 0, h: 0}); + let display_options = FilterOptions(options, data); const close = () => { setShow(false); document.removeEventListener("scroll", handleScroll, true); @@ -472,7 +470,7 @@ export function OptionsSummaryPopup({id, data}) { className="overlayVariant card border rounded" id={id}>
- {Array.from(Object.entries(data) + {Array.from(Object.entries(display_options) .filter(([key, value], _) => key !== "ext_data") .map(([key, value], _) => { return (

{key}: {stringify(value)}

);