[Team]: Fix Add to Cart modal form and close modal after form submission

.idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml

-<component name="libraryTable">
-  <library name="Maven: com.fasterxml:classmate:1.5.1">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/com/fasterxml/classmate/1.5.1/classmate-1.5.1-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_github_classgraph_classgraph_4_8_83.xml

-<component name="libraryTable">
-  <library name="Maven: io.github.classgraph:classgraph:4.8.83">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/github/classgraph/classgraph/4.8.83/classgraph-4.8.83.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/github/classgraph/classgraph/4.8.83/classgraph-4.8.83-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/github/classgraph/classgraph/4.8.83/classgraph-4.8.83-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_springfox_springfox_bean_validators_3_0_0.xml

-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-bean-validators:3.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-bean-validators/3.0.0/springfox-bean-validators-3.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-bean-validators/3.0.0/springfox-bean-validators-3.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-bean-validators/3.0.0/springfox-bean-validators-3.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_springfox_springfox_boot_starter_3_0_0.xml

-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-boot-starter:3.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-boot-starter/3.0.0/springfox-boot-starter-3.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-boot-starter/3.0.0/springfox-boot-starter-3.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-boot-starter/3.0.0/springfox-boot-starter-3.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_springfox_springfox_core_3_0_0.xml

-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-core:3.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/3.0.0/springfox-core-3.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/3.0.0/springfox-core-3.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-core/3.0.0/springfox-core-3.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_springfox_springfox_data_rest_3_0_0.xml

-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-data-rest:3.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-data-rest/3.0.0/springfox-data-rest-3.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-data-rest/3.0.0/springfox-data-rest-3.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-data-rest/3.0.0/springfox-data-rest-3.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_springfox_springfox_oas_3_0_0.xml

-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-oas:3.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-oas/3.0.0/springfox-oas-3.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-oas/3.0.0/springfox-oas-3.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-oas/3.0.0/springfox-oas-3.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_springfox_springfox_schema_3_0_0.xml

-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-schema:3.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/3.0.0/springfox-schema-3.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/3.0.0/springfox-schema-3.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-schema/3.0.0/springfox-schema-3.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_springfox_springfox_spi_3_0_0.xml

-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-spi:3.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/3.0.0/springfox-spi-3.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/3.0.0/springfox-spi-3.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spi/3.0.0/springfox-spi-3.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_springfox_springfox_spring_web_3_0_0.xml

-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-spring-web:3.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/3.0.0/springfox-spring-web-3.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/3.0.0/springfox-spring-web-3.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-web/3.0.0/springfox-spring-web-3.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_springfox_springfox_spring_webflux_3_0_0.xml

-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-spring-webflux:3.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-webflux/3.0.0/springfox-spring-webflux-3.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-webflux/3.0.0/springfox-spring-webflux-3.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-webflux/3.0.0/springfox-spring-webflux-3.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_springfox_springfox_spring_webmvc_3_0_0.xml

-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-spring-webmvc:3.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-webmvc/3.0.0/springfox-spring-webmvc-3.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-webmvc/3.0.0/springfox-spring-webmvc-3.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-spring-webmvc/3.0.0/springfox-spring-webmvc-3.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_springfox_springfox_swagger2_3_0_0.xml

-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-swagger2:3.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/3.0.0/springfox-swagger2-3.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/3.0.0/springfox-swagger2-3.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger2/3.0.0/springfox-swagger2-3.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_springfox_springfox_swagger_common_3_0_0.xml

-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-swagger-common:3.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/3.0.0/springfox-swagger-common-3.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/3.0.0/springfox-swagger-common-3.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-common/3.0.0/springfox-swagger-common-3.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_springfox_springfox_swagger_ui_3_0_0.xml

-<component name="libraryTable">
-  <library name="Maven: io.springfox:springfox-swagger-ui:3.0.0">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/3.0.0/springfox-swagger-ui-3.0.0.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/3.0.0/springfox-swagger-ui-3.0.0-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/springfox/springfox-swagger-ui/3.0.0/springfox-swagger-ui-3.0.0-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_swagger_core_v3_swagger_annotations_2_1_2.xml

-<component name="libraryTable">
-  <library name="Maven: io.swagger.core.v3:swagger-annotations:2.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/core/v3/swagger-annotations/2.1.2/swagger-annotations-2.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/core/v3/swagger-annotations/2.1.2/swagger-annotations-2.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/core/v3/swagger-annotations/2.1.2/swagger-annotations-2.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_swagger_core_v3_swagger_models_2_1_2.xml

-<component name="libraryTable">
-  <library name="Maven: io.swagger.core.v3:swagger-models:2.1.2">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/core/v3/swagger-models/2.1.2/swagger-models-2.1.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/core/v3/swagger-models/2.1.2/swagger-models-2.1.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/core/v3/swagger-models/2.1.2/swagger-models-2.1.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_swagger_swagger_annotations_1_5_20.xml

-<component name="libraryTable">
-  <library name="Maven: io.swagger:swagger-annotations:1.5.20">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-annotations/1.5.20/swagger-annotations-1.5.20-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__io_swagger_swagger_models_1_5_20.xml

-<component name="libraryTable">
-  <library name="Maven: io.swagger:swagger-models:1.5.20">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.20/swagger-models-1.5.20.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.20/swagger-models-1.5.20-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/io/swagger/swagger-models/1.5.20/swagger-models-1.5.20-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__org_mapstruct_mapstruct_1_3_1_Final.xml

-<component name="libraryTable">
-  <library name="Maven: org.mapstruct:mapstruct:1.3.1.Final">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.3.1.Final/mapstruct-1.3.1.Final.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.3.1.Final/mapstruct-1.3.1.Final-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/mapstruct/mapstruct/1.3.1.Final/mapstruct-1.3.1.Final-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__org_springframework_plugin_spring_plugin_core_2_0_0_RELEASE.xml

-<component name="libraryTable">
-  <library name="Maven: org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/2.0.0.RELEASE/spring-plugin-core-2.0.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/2.0.0.RELEASE/spring-plugin-core-2.0.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-core/2.0.0.RELEASE/spring-plugin-core-2.0.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

.idea/libraries/Maven__org_springframework_plugin_spring_plugin_metadata_2_0_0_RELEASE.xml

-<component name="libraryTable">
-  <library name="Maven: org.springframework.plugin:spring-plugin-metadata:2.0.0.RELEASE">
-    <CLASSES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/2.0.0.RELEASE/spring-plugin-metadata-2.0.0.RELEASE.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/2.0.0.RELEASE/spring-plugin-metadata-2.0.0.RELEASE-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$MAVEN_REPOSITORY$/org/springframework/plugin/spring-plugin-metadata/2.0.0.RELEASE/spring-plugin-metadata-2.0.0.RELEASE-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
\ No newline at end of file

ecom-web/src/components/product-market/product-details.jsx

@@ -3,7 +3,15 @@ import React, { Component } from 'react'
 export default class ProductDetails extends Component {
     constructor(props) {
         super(props)
-        this.state = {}
+        this.state = {
+            orderItemQuantity: 1,
+        }
+    }
+
+    handleChange(type) {
+        return e => {
+            this.setState({ [type]: e.target.value })
+        }
     }
 
     handleSubmit(e, product) {
@@ -12,6 +20,15 @@ export default class ProductDetails extends Component {
             userId: this.props.user.currentUser.email,
             cartItems: JSON.parse(JSON.stringify(this.props.cart)) // JSON.parse/stringify will deep-dup the object
         })
+        for (let i = 0; i < newCart.cartItems.length; i++) {
+            let item = newCart.cartItems[i];
+            if(item.productRef.sku === product.sku) {
+                item.quantity += parseInt(this.state.orderItemQuantity)
+                this.props.addToCart(newCart, this.props.user.currentUser.email)
+                    .then(() => this.props.closeModal(e))
+                return;
+            }
+        }
         const newCartItem = {
             productRef: {
                 id: product.sku,
@@ -21,7 +38,8 @@ export default class ProductDetails extends Component {
             quantity: parseInt(this.state.orderItemQuantity)
         }
         newCart.cartItems.push(newCartItem);
-        this.props.addToCart(newCart, this.props.user.currentUser.email);
+        this.props.addToCart(newCart, this.props.user.currentUser.email)
+        .then(() => this.props.closeModal(e))
     }
     
     render() {
@@ -69,7 +87,9 @@ export default class ProductDetails extends Component {
                                 type="number" 
                                 className="prod-details-quantity" 
                                 disabled={ !this.props.user?.currentUser } 
+                                onChange={this.handleChange("orderItemQuantity")}
                                 placeholder="Quantity" 
+                                value={ this.state.orderItemQuantity }
                             />
                             <button className="prod-details-add-to-cart" disabled={ !this.props.user?.currentUser }>
                                 Add to Cart

ecom-web/src/components/product-market/product-item.jsx

@@ -141,6 +141,8 @@ export default class ProductItem extends Component {
                         discount={ discount } 
                         user={ this.props.user }
                         addToCart={ this.props.addToCart }
+                        cart={ this.props.cart }
+                        closeModal={ this.toggleDetailsModal }
                     />
                 </Modal>
             </div>