|
@@ -8331,7 +8331,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
// total
|
|
// total
|
|
|
- totalPrice = payments_and_credist + lift_gate + handlingFee + shippingFee;
|
|
|
|
|
|
|
+ totalPrice = payments_and_credist + lift_gate + shippingFee + handlingFee;
|
|
|
ret[@"Total"] = [NSString stringWithFormat:@"$%.2f",totalPrice];
|
|
ret[@"Total"] = [NSString stringWithFormat:@"$%.2f",totalPrice];
|
|
|
|
|
|
|
|
ret[@"order_info"]= orderinfo;
|
|
ret[@"order_info"]= orderinfo;
|
|
@@ -8525,7 +8525,7 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
|
|
|
}];
|
|
}];
|
|
|
|
|
|
|
|
// total
|
|
// total
|
|
|
- total = payments_and_credist + lift_gate + handlingFee + shippingFee;
|
|
|
|
|
|
|
+ total = payments_and_credist + lift_gate + shippingFee + handlingFee;
|
|
|
|
|
|
|
|
|
|
|
|
|
if (close) {
|
|
if (close) {
|
|
@@ -9956,15 +9956,16 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
|
|
|
};
|
|
};
|
|
|
[dic setValue:payments_dic forKey:@"item_0"];
|
|
[dic setValue:payments_dic forKey:@"item_0"];
|
|
|
|
|
|
|
|
- NSDictionary *handling_fee_dic = @{
|
|
|
|
|
- @"align" : @"right",
|
|
|
|
|
- @"aname" : @"Handling Fee",
|
|
|
|
|
- @"control" : @"text",
|
|
|
|
|
- @"name" : @"handling_fee_value",
|
|
|
|
|
- @"required" : @"true",
|
|
|
|
|
- @"type" : @"price",
|
|
|
|
|
- @"value" : @"Shipping To Be Quoted"/*[NSString stringWithFormat:@"%.2f",handling_fee]*/
|
|
|
|
|
- };
|
|
|
|
|
|
|
+ // version 1.71 remove
|
|
|
|
|
+// NSDictionary *handling_fee_dic = @{
|
|
|
|
|
+// @"align" : @"right",
|
|
|
|
|
+// @"aname" : @"Handling Fee",
|
|
|
|
|
+// @"control" : @"text",
|
|
|
|
|
+// @"name" : @"handling_fee_value",
|
|
|
|
|
+// @"required" : @"true",
|
|
|
|
|
+// @"type" : @"price",
|
|
|
|
|
+// @"value" : @"Shipping To Be Quoted"/*[NSString stringWithFormat:@"%.2f",handling_fee]*/
|
|
|
|
|
+// };
|
|
|
|
|
|
|
|
|
|
|
|
|
NSDictionary *shipping_dic = @{
|
|
NSDictionary *shipping_dic = @{
|
|
@@ -10006,8 +10007,8 @@ NSString* gprice = [self get_portfolio_price :appDelegate.contact_id item_id:ite
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-
|
|
|
|
|
- [dic setValue:handling_fee_dic forKey:[NSString stringWithFormat:@"item_%d",item_count++]];
|
|
|
|
|
|
|
+ // version 1.71 remove
|
|
|
|
|
+// [dic setValue:handling_fee_dic forKey:[NSString stringWithFormat:@"item_%d",item_count++]];
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|