Subversion Repositories SmartDukaan

Rev

Rev 6662 | Rev 6665 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 6662 Rev 6663
Line 1820... Line 1820...
1820 
        raw_message = '''
 1820 
        raw_message = '''
1821 
        Dear Sir/Madam,
 1821 
        Dear Sir/Madam,
1822
1822
1823 
        Kindly arrange a pickup today from %(customer_city)s. Pickup and delivery addresses are mentioned below.
 1823 
        Kindly arrange a pickup today from %(customer_city)s. Pickup and delivery addresses are mentioned below.
1824 
 
 1824 
 
- 
 
 1825 
        Order Id: %(order_id)s
1825 
        Pickup CODE: %(provider_code)s
 1826 
        Pickup CODE: %(provider_code)s
1826 
        Total Weight: %(order_weight)s kg
 1827 
        Total Weight: %(order_weight)s kg
1827
1828
1828 
        Pickup Address:
 1829 
        Pickup Address:
1829 
 
 1830 
 
Line 1844... Line 1845...
1844 
        else:
 1845 
        else:
1845 
            executive = 'Dinesh Kumar'
 1846 
            executive = 'Dinesh Kumar'
1846
1847
1847 
        message = dedent(raw_message) % { 'customer_city' : order.customer_city,
 1848 
        message = dedent(raw_message) % { 'customer_city' : order.customer_city,
1848 
                                          'provider_code' : provider.details[DeliveryType.PREPAID].accountNo,
 1849 
                                          'provider_code' : provider.details[DeliveryType.PREPAID].accountNo,
- 
 
 1850 
                                          'order_id' : str(order_id),
1849 
                                          'order_weight' : str(order.total_weight),
 1851 
                                          'order_weight' : str(order.total_weight),
1850 
                                          'customer_address' : __get_order_address(order),
 1852 
                                          'customer_address' : __get_order_address(order),
1851 
                                          'warehouse_executive' : executive,
 1853 
                                          'warehouse_executive' : executive,
1852 
                                          'warehouse_address' : warehouse.location,
 1854 
                                          'warehouse_address' : warehouse.location,
1853 
                                          'warehouse_pin' : warehouse.pincode}
 1855 
                                          'warehouse_pin' : warehouse.pincode}