WebSVN – SmartDukaan – Diff – /trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py

 from shop2020.clients.UserClient import UserClient
 from shop2020.clients.WarehouseClient import WarehouseClient
 from shop2020.config.client.ConfigClient import ConfigClient
 from shop2020.model.v1 import order
 from shop2020.model.v1.order.impl import DataService, RechargeService
-from shop2020.model.v1.order.impl.Convertors import to_t_emi_scheme
+from shop2020.model.v1.order.impl.Convertors import to_t_emi_scheme, to_t_order
 from shop2020.model.v1.order.impl.DataService import Transaction, LineItem, \
     Order, BatchNoGenerator, InvoiceIDGenerator, TransactionRequiringExtraProcessing, \
     OrderInventory, Alert, PaymentSettlement, EBSSettlementSummary, \
     CodVerificationAgent, Attribute, RechargeVoucherTracker, EmiScheme, MiscCharges, \
     BlockedIpRange, DeniedIpAddress, InsuranceDetailForOrder, DocumentStore, \
             thank_you_html = thank_you_html + """If you are happy with our services please join us on <a href="http://www.facebook.com/mysaholic">Facebook</a>/<a href="https://twitter.com/saholic">Twitter</a> and help us spread the word."""
         else :
             thank_you_html = str(order.lineitems[0]) + """ ordered by you has been delivered.
             Thank you for shopping with us. Please do join us at our <a href="http://www.facebook.com/mysaholic">Facebook Page</a>, and share your experience with other shoppers. Following are the details of your order.<br>
             """
+    freebie_text = "<br/>"
+    if order.freebieItemId:
+        catalog_client = CatalogClient().get_client()
+        item = catalog_client.getItem(order.freebieItemId)
+        freebie_text = freebie_text = "We have also delivered " + item.brand + " " + item.modelName + "" + item.modelNumber +" as promised"
+    else:
+        freebie_orderId = get_order_attribute_value(order.id, "freebieOrderId")
+        if freebie_orderId != "":
+            line_items = get_line_items_for_order(int(freebie_orderId))
+            freebie_order = get_order(int(freebie_orderId))
+            freebie_text = freebie_text + " We wish to inform you that your freebie item " +line_items[0].brand + " " + line_items[0].model_name + " " + line_items[0].model_number + " will be sent as a separate order with OrderId : " + freebie_orderId + " and is expected to be delivered on " + freebie_order.expected_delivery_time.strftime("%A, %d %B %Y")+ "<br/>You can track the status of this order from My Orders section in saholic.com"
     html_header = html_header + thank_you_html + """
         </p>
         <div>
             Order Date: $order_date <br>
         <tr>
             <td colspan=4>Total Amount</td>
             <td> Rs. $total_amount</td>
         </tr>
         </table>
+        $freebie_text
     </div>
     <p>
         Best Wishes,<br />
         $source_name Team
     </p>
     dt = datetime.datetime.strptime(str(order_date), "%Y-%m-%d %H:%M:%S")
     formated_order_date = dt.strftime("%A, %d. %B %Y %I:%M%p")
     email_header = Template(html_header).substitute(dict(order_date = formated_order_date, customer_name = customer_name, pickup_text = pickup_text, source_url = source_url))
-    email_footer = Template(html_footer).substitute(dict(total_amount = "%.2f" % total_amount, source_name = source_name))
+    email_footer = Template(html_footer).substitute(dict(total_amount = "%.2f" % total_amount, source_name = source_name, freebie_text = freebie_text))
     try:
         helper_client = HelperClient(host_key = "helper_service_server_host_prod").get_client()
         if order.insurer:
             helper_client.saveUserEmailForSending([user_email], "", subject, email_header + html_table + email_footer, str(order.id), "DeliverySuccess", [], ["pramit.singh@shop2020.in ","anupam.singh@shop2020.in","rajveer.singh@shop2020.in"])
         raise TransactionServiceException(101, "No order found for the given order id" + str(orderId))
     '''
     First checking whether freebie can be billed or not otherwise wont proceed.
     '''
-    if billingType == BillingType.OURS:
+    if order.freebieItemId:
-        if order.freebieItemId is not None or order.freebieItemId>0:
+        if billingType == BillingType.OURS or billingType == BillingType.OURS_EXTERNAL:
-            if freebieWarehouseId is not None or freebieWarehouseId >0:
+            if freebieWarehouseId:
                 try:
+                    inventory_client = InventoryClient().get_client()
+                    warehouse = inventory_client.getWarehouse(freebieWarehouseId)
+                    if warehouse.warehouseType!= 'OURS'or warehouse.inventoryType != 'GOOD':
+                        raise TransactionServiceException(110,'Billing of Freebie is only allowed from OURS_GOOD warehouses ')
                     warehouse_client = WarehouseClient().get_client()
                     inventoryItem = warehouse_client.scanfreebie(orderId, order.freebieItemId, freebieWarehouseId, ScanType.SALE);
                     attr = Attribute()
                     attr.orderId = orderId
                     attr1.orderId = orderId
                     attr1.name = "freebie_vendor"
                     attr1.value = str(inventoryItem.supplierId)
                     inventory_client = InventoryClient().get_client()
-                    warehouse = inventory_client.getWarehouse(freebieWarehouseId)
                     item_pricing = inventory_client.getItemPricing(order.freebieItemId, warehouse.vendor.id)
-                    #lineitem.transfer_price = item_pricing.transferPrice
                     attr2 = Attribute()
                     attr2.orderId = orderId
                     attr2.name = "freebie_nlc"
                     attr2.value = str(item_pricing.nlc)
                 except Exception as e:
                     print sys.exc_info()[0]
                     print e.message
-                    raise Exception('Error in billing freebie for warehouseId ' + str(freebieWarehouseId))
+                    raise TransactionServiceException(110,'Error in billing freebie for warehouseId ' + str(freebieWarehouseId))
+            else:
+                raise TransactionServiceException(110,'No warehouseId provided for billing of freebie ')
+        else:
+            raise TransactionServiceException(110,'Order with freebies associated with it cant be billed from an external warehouse ')
     lineitem = order.lineitems[0]
     item_id = lineitem.item_id
 #    inventoryClient = InventoryClient().get_client()
 #    if not inventoryClient.isOrderBillable(item_id, order.fulfilmentWarehouseId, sourceId, orderId):
 <div>
     <p>Dear Customer,</p>
     <p>
         We are pleased to inform that we have shipped the order: $order_id for your product $product_name on $shipping_datetime.
         The shipment will be delivered to you via $courier_name Courier Service vide AWB# $awb.
-        $freebie_text
     </p>
     <p>
         Expected delivery date for your order is $expected_delivery_date.
         <br/>
         $otg_text
+        $freebie_text
         <br/>
         The product can be delivered to you between business hours of 10am to 6pm.
         You can Check the current shipment updates for your product online at <a href="www.saholic.com/myaccount">Open Orders</a>.
     </p>
     <p>
     freebie_text = "<br/>"
     if order.freebieItemId:
         catalog_client = CatalogClient().get_client()
         item = catalog_client.getItem(order.freebieItemId)
-        freebie_text = freebie_text = "We have also sent you " + item.brand + " " + item.modelName + item.modelNumber +" as promised"
+        freebie_text = freebie_text = "We have also shipped you " + item.brand + " " + item.modelName + "" + item.modelNumber +" as promised<br/>"
     else:
         freebie_orderId = get_order_attribute_value(order.id, "freebieOrderId")
         if freebie_orderId != "":
             line_items = get_line_items_for_order(int(freebie_orderId))
-            freebie_text = freebie_text + "Due to some unavoidable issues in procuring " +line_items(0).brand + " " + line_items(0).model_name + " " + line_items(0).model_number
+            freebie_order = get_order(int(freebie_orderId))
-            freebie_text = freebie_text + " Your freebie will be sent as a separate order with OrderId : " + freebie_orderId + "<br/> You can track the status of this order from My Orders section in saholic.com"
+            freebie_text = freebie_text + "We wish to inform you that your freebie item " +line_items[0].brand + " " + line_items[0].model_name + " " + line_items[0].model_number + " will be sent as a separate order with OrderId : " + freebie_orderId + " and is expected to be delivered on " + freebie_order.expected_delivery_time.strftime("%A, %d %B %Y")+ "<br/>"
+        else:
+            freebie_text = ""
     info = dict(order_id = order.id, product_name = product, shipping_datetime = shipping_date, awb = order.airwaybill_no, expected_delivery_date = new_expected_delivery_date, courier_name = provider_name, courier_phone = provider_phone, source_name = source_name, otg_text = otg_text, freebie_text = freebie_text)
     return Template(html).substitute(info)
 def enqueue_shipping_confirmation_email(order):
     freebie_order.promised_delivery_time = order.promised_delivery_time
     freebie_order.expected_shipping_time = to_py_date(shippingDate)
     freebie_order.promised_shipping_time = order.promised_shipping_time
     inventory_client = InventoryClient().get_client()
-    item_availability = inventory_client.getItemAvailabilityAtLocation(freebie_order.lineitems[0].item_id,1)
+    item_availability = inventory_client.getItemAvailabilityAtLocation(order.freebieItemId,1)
     freebie_order.warehouse_id = item_availability[2]
     freebie_order.fulfillmentWarehouseId = item_availability[0]
     catalog_client = CatalogClient().get_client()
     item = catalog_client.getItem(order.freebieItemId)
     litem.total_price = 0.01
     litem.total_weight = item.weight
     litem.vatRate = 5.0
     freebie_order.lineitems.append(litem)
+    order.freebieItemId = 0
     session.commit()
+    order.lineitems[0].extra_info = "Parent Order for Order ID " + str(freebie_order.id)
+    inventory_client = InventoryClient().get_client()
-    inventory_client.reserveItemInWarehouse(freebie_order.lineitems[0].item_id, item_availability[0], 1, freebie_order.id, datetime.datetime.now(), order.promised_shipping_time, 1)
+    inventory_client.reserveItemInWarehouse(freebie_order.lineitems[0].item_id, item_availability[0], sourceId, freebie_order.id, to_java_date(freebie_order.created_timestamp), to_java_date(freebie_order.promised_shipping_time), 1)
     parentOrderAttribute = Attribute()
     parentOrderAttribute.orderId = freebie_order.id
     parentOrderAttribute.name = "parentOrderIdForFreebie"
     parentOrderAttribute.value = str(order.id)
     freebieOrderAttribute.orderId = order.id
     freebieOrderAttribute.name = "freebieOrderId"
     freebieOrderAttribute.value = str(freebie_order.id)
     session.commit()
-    return freebie_order
+    return to_t_order(freebie_order)
 def __printRechargeInvoice(filename, operator, amount, telNum, customerName, invNum, billingTime, payMethod):
     PAGE_HEIGHT=defaultPageSize[1];
     styles = getSampleStyleSheet()
     styles.add(ParagraphStyle(name='prologue', alignment=TA_CENTER, fontName="Courier", rightIndent = 5, fontSize=10), alias='sH')

Subversion Repositories SmartDukaan

(root)/trunk/PyProj/src/shop2020/model/v1/order/impl/DataAccessors.py – Rev 7190 → 7198