Skip to content
This repository was archived by the owner on Oct 30, 2023. It is now read-only.

Commit 0a512be

Browse files
authored
Merge pull request #237 from FlowzPlatform/changes-in-qa
changes in qa
2 parents f69e916 + 3ed2e1e commit 0a512be

File tree

5 files changed

+19
-3
lines changed

5 files changed

+19
-3
lines changed

service/src/schema/product_additional_charge.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
price_5:"number",
6060

6161
code_5:"string",
62+
63+
Net_Price_5:"number",
6264

6365

6466
qty_6_min:"number",

service/src/schema/product_images.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ const ProductImageSchema = {
4545

4646
web_image_7: "string",
4747

48+
image_color_code_7: "string",
49+
4850
color_8:"string",
4951

5052
web_image_8:"string",

service/src/schema/product_imprint_data.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ const ProductImprintDataSchema = {
8282

8383

8484
qty_6_min:"number",
85+
qty_6_max:"number",
8586

8687
price_6:"number",
8788
code_6: "string",

service/src/schema/product_shipping.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
qty_1_min:"number",
4545

4646
qty_1_max:"number",
47+
48+
qty_2_min:"number",
4749

4850
qty_2_max:"number",
4951

service/src/services/pdm-uploader-data/pdm-uploader-data.service.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,20 +127,29 @@ var connectToMongo = async function(url,data,socket){
127127
}
128128

129129

130-
for(let i=0;i<data.newCSV.length;i++){
130+
for(let i=0;i<data.newCSV.length;i++){
131131
for(key in data.newCSV[i]){
132132
for(let schema_key in schemarules){
133133
if(key == schema_key && schemarules[schema_key] == "string"){
134134
if(typeof(data.newCSV[i][key]) != "string"){
135-
data.newCSV[i][key] = data.newCSV[i][key].toString()
135+
if(data.newCSV[i][key] != null){
136+
data.newCSV[i][key] = data.newCSV[i][key].toString()
137+
}
138+
else if(data.newCSV[i][key] == null){
139+
data.newCSV[i][key] = ""
140+
}
141+
}
142+
}
143+
else if(key == schema_key && schemarules[schema_key] != "string"){
144+
if(data.newCSV[i][key] == null){
145+
data.newCSV[i][key] = ""
136146
}
137147
}
138148
}
139149
}
140150
}
141151

142152

143-
144153
if(db){
145154
var response = await (db.listCollections().toArray())
146155
let index = _.findIndex(response, function(o) { return o.name == collection_name; });

0 commit comments

Comments
 (0)