Implemented: logic to edit data #22c8vgh #8

disha1202 · 2022-03-01T13:43:32Z

No description provided.

…to map parsed Csv and implemented order state(#22c8vf8)

adityasharma7 · 2022-03-02T11:43:26Z

src/store/modules/order/OrderState.ts

@@ -0,0 +1,7 @@
+export default interface OrderState {
+    order: {


https://github.com/hotwax/import/pull/5/files#r815722811

Updated the order state

adityasharma7 · 2022-03-02T11:44:28Z

src/store/modules/order/actions.ts

+  modifyCsv ({ commit }, payload) {
+    commit(types.MODIFY_CSV, payload);
+  },
+  async groupProducts ({commit}, csv: any) {


I this should a getter instead

In this action we are fetching product information and storing in order state.
Can we still add it in getters?

adityasharma7 · 2022-03-02T11:45:41Z

src/store/modules/order/actions.ts

+  updateOrderList ({ commit }, payload) {
+    commit(types.ORDER_LIST_UPDATED,  payload );
+  },
+  modifyCsv ({ commit }, payload) {


We will be performing updates on order item list only. The state will not update any CSV, but order list

Updated the code.

adityasharma7 · 2022-03-02T11:47:15Z

src/store/modules/order/actions.ts

+    const productIds = csv.map((item: any) => {
+      return item.shopifyproductSKU
+    })
+    const viewSize = process.env.VUE_APP_VIEW_SIZE;


I think value should be productIds length

Made the requested change.

adityasharma7 · 2022-03-02T11:53:45Z

src/store/modules/order/actions.ts

+          if(item.shopifyproductSKU == product.internalName)
+          return product;
+        })
+        console.log(product);


It seems we missed a console log

adityasharma7 · 2022-03-02T11:54:48Z

src/store/modules/order/actions.ts

+          return product;
+        })
+        console.log(product);
+        item.groupId = product.groupId;


Suggested change

item.groupId = product.groupId;

item.parentProductId = product.groupId;

Made the requested change

adityasharma7 · 2022-03-02T11:56:09Z

src/store/modules/order/actions.ts

+        item.isNewProduct = false;
+        return item;
+    })
+    await store.dispatch('order/updateOrderList', csv);


Improve variable name: csv
We will only deal with order list

Improved variable name

adityasharma7 · 2022-03-02T11:56:52Z

src/store/modules/order/mutations.ts

+const mutations: MutationTree <OrderState> = {
+  [types.ORDER_LIST_UPDATED] (state, payload) {
+    state.order.originalCsv = payload;
+    console.log(payload);


console log missed

adityasharma7 · 2022-03-02T11:57:48Z

src/views/PurchaseOrder.vue

        this.file = event.target.files[0];
        this.parseFile();
      },
      async parseFile(){
        await parseCsv(this.file).then(res => {
          this.content = res;
-          console.log(res);
+          // console.log(res);


Missed console log

adityasharma7 · 2022-03-02T11:58:13Z

src/views/PurchaseOrder.vue

+      mapFields() {
+        // console.log(this.csvParsed);
+
+        this.csvParsed = this.content.map(item => {


order item list

adityasharma7 · 2022-03-03T05:30:19Z

src/store/modules/order/actions.ts

+        return item;
+    })
+    await store.dispatch('order/orderListOriginal', orderItems);
+    router.push({


Move this to specific component

Moved to the specific component.

adityasharma7 · 2022-03-03T06:17:28Z

src/store/modules/order/actions.ts

+
+
+const actions: ActionTree<OrderState, RootState> = {
+  orderListOriginal ({ commit }, payload) {


I think this is not needed

Yes Sir, removed.

adityasharma7 · 2022-03-03T06:18:31Z

src/store/modules/order/index.ts

+const productModule: Module<OrderState, RootState> = {
+  namespaced: true,
+  state: {
+    order: {


list: { items: [], original: [] }

Updated order state

adityasharma7 · 2022-03-03T06:19:14Z

src/views/OrderDetail.vue

+    data() {
+      return {
+        numberOfDays: 0,
+        numberOfpieces: 0,


Suggested change

numberOfpieces: 0,

numberOfPieces: 0,

Made the requested change.

adityasharma7 · 2022-03-03T06:19:32Z

src/views/OrderDetail.vue

+        numberOfpieces: 0,
+        catalog: "",
+        listOfCheckedProducts: [] as any,
+        originalCsv: {}


Improve variable name

adityasharma7 · 2022-03-03T06:20:32Z

src/views/PurchaseOrder.vue

+          const orderItem = {
+          orderId: [],
+          shopifyproductSKU: [],
+          shopifyproductUPC: [],


Suggested change

shopifyproductUPC: [],

shopifyProductUPC: [],

Made the requested change.

adityasharma7 · 2022-03-03T06:20:52Z

src/store/modules/order/actions.ts

+  orderListOriginal ({ commit }, payload) {
+    commit(types.ORDER_LIST_ORIGINAL,  payload );
+  },
+  async groupProducts ({commit}, orderItems: any) {


Improve method name

Improved method name.

adityasharma7 · 2022-03-03T06:22:18Z

src/store/modules/order/actions.ts

+    orderItems = orderItems.map((item: any) => {
+        const product = resp.data.response.docs.find((product: any) => {
+          if(item.shopifyproductSKU == product.internalName)
+          return product;


I think if is not needed

Suggested change

return product;

return item.shopifyproductSKU == product.internalName;

Made the requested change.

adityasharma7 · 2022-03-03T06:23:24Z

src/views/OrderDetail.vue

+        <div class="filters">
+          <ion-item>
+            <ion-label>{{ $t("Buffer days") }}</ion-label>
+            <ion-input v-model="numberOfDays" type="text" placeholder="all items" /> 


Placeholder should be internationalised

Internationalised placeholder text.

adityasharma7 · 2022-03-03T06:24:57Z

src/views/OrderDetail.vue

+        <div v-for="item in getGroupItems(id, orderItems)" :key="item">
+          <div class="list-header" >
+            <ion-label>{{ item.parentProductName }}</ion-label>
+            <ion-chip >


You could use self closing <div /> for empty space

Used self closing
for empty space.

adityasharma7 · 2022-03-03T08:36:49Z

src/store/modules/order/actions.ts

+
+
+const actions: ActionTree<OrderState, RootState> = {
+  async orderListUpdated ({commit}, orderItems) {


Suggested change

async orderListUpdated ({commit}, orderItems) {

async updatedOrderList ({commit}, orderItems) {

adityasharma7 · 2022-03-03T08:38:33Z

src/store/modules/order/mutation-types.ts

@@ -0,0 +1,3 @@
+export const SN_ORDER = 'order'
+export const ORDER_LIST_UPDATED = SN_ORDER + '/LIST_UPDATED'
+export const ORDER_ITEMS_UPDATED = SN_ORDER + '/ITEMS_UPDATED'


I think this is not used anywhere. We could remove

adityasharma7 · 2022-03-03T08:41:54Z

src/views/OrderDetail.vue

+      apply() {
+        this.ordersList.items.map((item: any) => {
+          if (this.listOfCheckedProducts.includes(item.shopifyProductSKU)) {
+            item.quantityOrdered -= this.numberOfPieces;


I think here we should only updates values changed

adityasharma7 · 2022-03-03T08:42:49Z

src/views/OrderDetail.vue

+      getGroupItems(parentProductId: any, items: any) {
+        return items.filter((item: any) => item.parentProductId == parentProductId)
+      },
+      checkAllProducts() {


Suggested change

checkAllProducts() {

selectAllItems() {

adityasharma7 · 2022-03-03T08:44:16Z

src/views/OrderDetail.vue

+          this.checkProducts(item.shopifyProductSKU);
+        })
+      },
+      checkGroupedProducts(parentProductId: any){


Suggested change

checkGroupedProducts(parentProductId: any){

selectParentProduct(parentProductId: any){

adityasharma7 · 2022-03-03T08:47:16Z

src/store/modules/order/getters.ts

+import RootState from "../../RootState";
+
+const getters: GetterTree<OrderState, RootState> = {
+  getOrdersList(state){


Suggested change

getOrdersList(state){

getOrder(state){

adityasharma7 · 2022-03-03T08:48:54Z

src/views/OrderDetail.vue

+    <ion-content :fullscreen="true">
+      <div class="header">
+        <div class="search">
+          <ion-searchbar> </ion-searchbar>


Suggested change

<ion-searchbar> </ion-searchbar>

<ion-searchbar />

src/views/OrderDetail.vue

adityasharma7 · 2022-03-03T08:50:39Z

src/views/OrderDetail.vue

+          if (this.listOfCheckedProducts.includes(item.shopifyProductSKU)) {
+            item.quantityOrdered -= this.numberOfPieces;
+            item.arrivalDate = DateTime.fromFormat(item.arrivalDate, "D").plus({ days: this.numberOfDays }).toFormat('MM/dd/yyyy');
+            if (this.catalog == "Preorder") item.isNewProduct = true


Suggested change

if (this.catalog == "Preorder") item.isNewProduct = true

item.isNewProduct = this.catalog == "Preorder"

adityasharma7 · 2022-03-03T08:52:02Z

src/views/OrderDetail.vue

+      },
+      checkAllProducts() {
+        this.ordersList.items.forEach((item: any) => {
+          this.checkProducts(item.shopifyProductSKU);


If one of them is already selected this will unselect it, but it should select all

ymaheshwari1 · 2022-03-04T05:53:24Z

src/store/modules/order/actions.ts

+        return item;
+    })
+    const original = JSON.parse(JSON.stringify(items))
+    commit(types.ORDER_LIST_UPDATED, { items: items, original: original });


Suggested change

commit(types.ORDER_LIST_UPDATED, { items: items, original: original });

commit(types.ORDER_LIST_UPDATED, { items, original });

disha1202 added 9 commits February 23, 2022 19:15

Implemeted Static UI for displaying parsed csv and Implemented logic …

4b96fb4

…to map parsed Csv and implemented order state(#22c8vf8)

Improved spacing(#22c8vf8)

e39d275

Rendered data on purchase order detail page(#22c8vf8)

85cf50f

Added changelog entry(#22c8vf8)

a9b1146

Improved code to render data on order detail page(#22c8vf8)

30ce3d5

Removed unwanted code(#22c8vf8)

b8bde2d

Implemented logic to get product information(#22c8vf8)

0919210

Improved spacing and removed console statements(#22c8vf8)

83da67d

Implemented logic to render data(#22c8vgh)

0eca8be

disha1202 changed the title ~~Implemented: logic to edit data #22c8vgh~~ [WIP] Implemented: logic to edit data #22c8vgh Mar 1, 2022

Improved logic to render products(#22c8vgh)

af887f2

disha1202 changed the title ~~[WIP] Implemented: logic to edit data #22c8vgh~~ Implemented: logic to edit data #22c8vgh Mar 2, 2022

Merge branch 'main' of https://github.com/hotwax/import into #22c8vgh

29a5de0

adityasharma7 suggested changes Mar 2, 2022

View reviewed changes

disha1202 added 4 commits March 2, 2022 18:31

Updated code(#22c8vgh)

21b1b04

Updated code (#22c8vgh)

4529e82

Updated order getters(#22c8vgh)

85bd3b0

Improved code(#22c8vgh)

6181616

adityasharma7 suggested changes Mar 3, 2022

View reviewed changes

Improved code and updated method name and valiables name(#22c8vgh)

80255ff

adityasharma7 suggested changes Mar 3, 2022

View reviewed changes

disha1202 added 6 commits March 3, 2022 16:40

Improved order state and logic to select products(#22c8vgh)

7f1a888

Updated order state and logic to select products(#22c8vgh)

dc7df79

Added changelog entry(#22c8vgh)

831de85

Improved indentation and removed unwanted changes(#22c8vgh)

57e9549

Updated the code to use correct variable(#22c8vgh)

5bb2d03

Updated component name(#22c8vgh)

116c7d0

ymaheshwari1 requested changes Mar 4, 2022

View reviewed changes

ymaheshwari1 approved these changes Mar 4, 2022

View reviewed changes

Improved order actions(#22c8vgh)

b796b47

adityasharma7 approved these changes Mar 4, 2022

View reviewed changes

adityasharma7 merged commit 660b7a5 into hotwax:main Mar 4, 2022

adityasharma7 mentioned this pull request Mar 4, 2022

Implemeted Static UI for displaying parsed csv and Implemented logic … #5

Closed

		@@ -0,0 +1,7 @@
		export default interface OrderState {
		order: {

	item.groupId = product.groupId;
	item.parentProductId = product.groupId;



		const actions: ActionTree<OrderState, RootState> = {
		orderListOriginal ({ commit }, payload) {

	return product;
	return item.shopifyproductSKU == product.internalName;



		const actions: ActionTree<OrderState, RootState> = {
		async orderListUpdated ({commit}, orderItems) {

	async orderListUpdated ({commit}, orderItems) {
	async updatedOrderList ({commit}, orderItems) {

	checkGroupedProducts(parentProductId: any){
	selectParentProduct(parentProductId: any){

	if (this.catalog == "Preorder") item.isNewProduct = true
	item.isNewProduct = this.catalog == "Preorder"

	commit(types.ORDER_LIST_UPDATED, { items: items, original: original });
	commit(types.ORDER_LIST_UPDATED, { items, original });

Implemented: logic to edit data #22c8vgh #8

Implemented: logic to edit data #22c8vgh #8

Conversation

disha1202 commented Mar 1, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment