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



    doa_logistics_provider_id = Field(Integer)
    local_connected_timestamp = Field(DateTime)
    reached_destination_timestamp = Field(DateTime)
    first_dlvyatmp_timestamp = Field(DateTime)
    orderInventory = OneToMany("OrderInventory")
    vendor_paid = Field(Boolean, default=0, server_default="0")
    originalOrderId = Field(Integer)
    fulfilmentWarehouseId = Field(Integer)
    using_options(shortnames=True)
    using_table_options(mysql_engine="InnoDB")
    

    using_options(shortnames=True)
    using_table_options(mysql_engine="InnoDB")
 
class PaymentSettlement(Entity):
    referenceId = Field(Integer)    #PaymentID in case of prepaid & Order Id in case of COD
    originalOrderId = Field(Integer)    #originalOrderId in case of prepaid is NULL & Order Id of original Order or Order Id in case of COD
    paymentGatewayId = Field(Integer)
    settlementDate = Field(DateTime)
    serviceTax = Field(Float)
    otherCharges = Field(Float)
    netCollection = Field(Float)

Subversion Repositories SmartDukaan

(root)/trunk/PyProj/src/shop2020/model/v1/order/impl/DataService.py – Rev 5348 → 5386

Rev 5348		Rev 5386
Line 122...		Line 122...
122	`doa_logistics_provider_id = Field(Integer)`	122	`doa_logistics_provider_id = Field(Integer)`
123	`local_connected_timestamp = Field(DateTime)`	123	`local_connected_timestamp = Field(DateTime)`
124	`reached_destination_timestamp = Field(DateTime)`	124	`reached_destination_timestamp = Field(DateTime)`
125	`first_dlvyatmp_timestamp = Field(DateTime)`	125	`first_dlvyatmp_timestamp = Field(DateTime)`
126	`orderInventory = OneToMany("OrderInventory")`	126	`orderInventory = OneToMany("OrderInventory")`
127	`vendor_paid = Field(Boolean)`	127	`vendor_paid = Field(Boolean, default=0, server_default="0")`
128	`originalOrderId = Field(Integer)`	128	`originalOrderId = Field(Integer)`
129	`fulfilmentWarehouseId = Field(Integer)`	129	`fulfilmentWarehouseId = Field(Integer)`
130	`using_options(shortnames=True)`	130	`using_options(shortnames=True)`
131	`using_table_options(mysql_engine="InnoDB")`	131	`using_table_options(mysql_engine="InnoDB")`
132		132
Line 192...		Line 192...
192	`using_options(shortnames=True)`	192	`using_options(shortnames=True)`
193	`using_table_options(mysql_engine="InnoDB")`	193	`using_table_options(mysql_engine="InnoDB")`
194		194
195	`class PaymentSettlement(Entity):`	195	`class PaymentSettlement(Entity):`
196	`referenceId = Field(Integer) #PaymentID in case of prepaid & Order Id in case of COD`	196	`referenceId = Field(Integer) #PaymentID in case of prepaid & Order Id in case of COD`
-		197	`originalOrderId = Field(Integer) #originalOrderId in case of prepaid is NULL & Order Id of original Order or Order Id in case of COD`
197	`paymentGatewayId = Field(Integer)`	198	`paymentGatewayId = Field(Integer)`
198	`settlementDate = Field(DateTime)`	199	`settlementDate = Field(DateTime)`
199	`serviceTax = Field(Float)`	200	`serviceTax = Field(Float)`
200	`otherCharges = Field(Float)`	201	`otherCharges = Field(Float)`
201	`netCollection = Field(Float)`	202	`netCollection = Field(Float)`