back merge buy_link_state_feature

Author: JasmeetLuthra

controllers/products.js

@@ -2,7 +2,7 @@ import {axios} from "../DukaanAPI";
 import ErrorHandler from "../helpers/ErrorHandler";
 import organizationController from './organizations';
 import userController from './users';
-
+import resourcesController from "./resources";
 
 const querystring = require('querystring');
 
@@ -126,7 +126,10 @@ const fetchOrganizations = () => {
 }
 
 const fetchGenerateLinkData = () => {
-    return fetchOrganizations()
+    return Promise.all([
+        fetchOrganizations(),
+        resourcesController.getStates()
+        ])
 }
 
 const fetchCenters = (organizationId) => {

forms/ProductLink.js

@@ -53,7 +53,8 @@ const initialValues = {
     user: '',
     applyCredits: false,
     category: '',
-    coupon: ''
+    coupon: '',
+    state: ''
 }
 
 class ProductLinkForm extends React.Component {
@@ -75,7 +76,11 @@ class ProductLinkForm extends React.Component {
         if (fields.coupon)
             couponQueryParams = `&coupon=${fields.coupon.code}`
 
-        const link = `https://dukaan.codingblocks.com/buy?productId=${productId}&oneauthId=${oneauthId}${useCreditsQueryParams}${couponQueryParams}`
+        let stateQueryParams = ''
+        if (fields.state)
+            stateQueryParams = `&state=${fields.state}`
+
+        const link = `https://dukaan.codingblocks.com/buy?productId=${productId}&oneauthId=${oneauthId}${useCreditsQueryParams}${couponQueryParams}${stateQueryParams}`
 
         this.props.ongenerateLink(link)
     }
@@ -362,6 +367,36 @@ class ProductLinkForm extends React.Component {
                                 </FormControl>
 
 
+                                <FormControl variant="outlined" size={"medium"}
+                                    fullWidth={true} className={"mb-4"}>
+                                    <InputLabel id="state">State</InputLabel>
+
+                                    <Select
+                                        value={values.state}
+                                        name={"state"}
+                                        onChange={(e) => {
+                                            this.props.unsetGeneratedLink()
+                                            setFieldValue("state", e.target.value)
+                                        }}
+                                        label="State">
+
+                                        <MenuItem value="">
+                                            <em>Select</em>
+                                        </MenuItem>
+                                        {
+                                            this.props.addressStates.map((state) => {
+                                                return (
+                                                    <MenuItem
+                                                        key={state.id}
+                                                        value={state.state_code}>{
+                                                        state.name
+                                                    }</MenuItem>
+                                                )
+                                            })
+                                        }
+
+                                    </Select>
+                                </FormControl>
 
                                 <FormControlLabel 
                                     className={"mb-4"}

pages/admin/products/generateLink.js

@@ -49,16 +49,17 @@ class GenerateLink extends React.Component {
             calculatedAmountDetails: '',
             loading: false,
             coupons: [],
-            coupon: ''
+            coupon: '',
+            addressStates: []
         }
     }
 
     componentDidMount() {
-        controller.fetchGenerateLinkData({
-            user_id: this.state.user_id
-        }).then((organizations) => {
+        controller.fetchGenerateLinkData()
+        .then(([organizations, states]) => {
             this.setState({
                 organizations: organizations.data,
+                addressStates: states.data
             })
         }).catch(error => {
             ErrorHandler.handle(error)
@@ -374,6 +375,7 @@ class GenerateLink extends React.Component {
                                 handleCouponChange={this.handleCouponChange}
                                 onCustomCouponClick={this.onCustomCouponClick}
                                 ref={this.buyLinkForm}
+                                unsetGeneratedLink={this.unsetGeneratedLink}
                             />
                         </div>