diff --git a/models/marts/reporting/rep_exchange__daily_orders.sql b/models/marts/reporting/rep_exchange__daily_orders.sql index 33ad7e3..6f747ca 100644 --- a/models/marts/reporting/rep_exchange__daily_orders.sql +++ b/models/marts/reporting/rep_exchange__daily_orders.sql @@ -28,7 +28,7 @@ dates AS ( transaction_orders_get_next_order_created_datetime AS ( SELECT *, - LEAD(order_created_datetime) OVER (PARTITION BY company_id ORDER BY order_created_datetime) AS next_order_created_datetime + LEAD(order_created_datetime) OVER (PARTITION BY company_id ORDER BY order_created_datetime, transaction_order_id) AS next_order_created_datetime FROM transaction_orders @@ -40,66 +40,66 @@ fct_and_dim_joins AS ( bookings.booking_marking_id, bookings.company_id, - companies.company_marking_id AS company_marking_id, - companies.autocount_id AS company_autocount_id, - companies.company_type AS company_type, - companies.business_type AS company_business_type, - companies.exchange_rate_segment AS company_exchange_rate_segment, - companies.is_migrated_company AS is_migrated_company, - companies.country_name AS company_country_name, - companies.state_name AS company_state_name, - companies.district_name AS company_district_name, - companies.postcode AS company_postcode, - companies.has_wallet AS company_has_wallet, - companies.latitude AS company_latitude, - companies.longitude AS company_longitude, + companies.company_marking_id AS company_marking_id, + companies.autocount_id AS company_autocount_id, + companies.company_type AS company_type, + companies.business_type AS company_business_type, + companies.exchange_rate_segment AS company_exchange_rate_segment, + companies.is_migrated_company AS is_migrated_company, + companies.country_name AS company_country_name, + companies.state_name AS company_state_name, + companies.district_name AS company_district_name, + companies.postcode AS company_postcode, + companies.has_wallet AS company_has_wallet, + companies.latitude AS company_latitude, + companies.longitude AS company_longitude, bookings.user_id, bookings.bank_id, - fix_currencies.currency_name AS fix_currency_name, + fix_currencies.currency_name AS fix_currency_name, quote_currencies.currency_name AS quote_currency_name, base_currencies.currency_name AS base_currency_name, bookings.service_type, - bookings.status AS booking_status, - bookings.is_first_time_company AS is_first_time_booking_company, - bookings.is_first_time_company_completed AS is_first_time_booking_company_completed, - bookings.is_first_time_user AS is_first_time_booking_user, - bookings.is_first_time_user_completed AS is_first_time_booking_user_completed, - bookings.estimate_base_to_quote_currency_exchange_rate AS estimate_booking_base_to_quote_currency_exchange_rate, - bookings.estimate_quote_value AS estimate_booking_quote_value, - bookings.estimate_base_value AS estimate_booking_base_value, - bookings.estimate_value_rm AS estimate_booking_value_rm, + bookings.status AS booking_status, + bookings.is_first_time_company AS is_first_time_booking_company, + bookings.is_first_time_company_completed AS is_first_time_booking_company_completed, + bookings.is_first_time_user AS is_first_time_booking_user, + bookings.is_first_time_user_completed AS is_first_time_booking_user_completed, + bookings.estimate_base_to_quote_currency_exchange_rate AS estimate_booking_base_to_quote_currency_exchange_rate, + bookings.estimate_quote_value AS estimate_booking_quote_value, + bookings.estimate_base_value AS estimate_booking_base_value, + bookings.estimate_value_rm AS estimate_booking_value_rm, bookings.booking_created_datetime, bookings.booking_approved_datetime, bookings.booking_completed_datetime, bookings.booking_suspended_datetime, - transaction_orders_get_next_order_created_datetime.transaction_order_id AS order_id, - transaction_orders_get_next_order_created_datetime.payment_method AS order_payment_method, + transaction_orders_get_next_order_created_datetime.transaction_order_id AS order_id, + transaction_orders_get_next_order_created_datetime.payment_method AS order_payment_method, transaction_orders_get_next_order_created_datetime.order_status, - transaction_orders_get_next_order_created_datetime.payment_reference AS order_payment_reference, - transaction_orders_get_next_order_created_datetime.bill_number AS order_bill_number, - transaction_orders_get_next_order_created_datetime.is_first_time_company AS is_first_time_order_company, - transaction_orders_get_next_order_created_datetime.is_first_time_company_completed AS is_first_time_order_company_completed, - transaction_orders_get_next_order_created_datetime.is_first_time_user AS is_first_time_order_user, - transaction_orders_get_next_order_created_datetime.is_first_time_user_completed AS is_first_time_order_user_completed, - transaction_orders_get_next_order_created_datetime.base_to_quote_currency_exchange_rate AS order_base_to_quote_currency_exchange_rate , - transaction_orders_get_next_order_created_datetime.base_value AS order_base_value , - transaction_orders_get_next_order_created_datetime.base_service_charge AS order_base_service_charge , - transaction_orders_get_next_order_created_datetime.base_tax AS order_base_tax , - transaction_orders_get_next_order_created_datetime.quote_value AS order_quote_value , - transaction_orders_get_next_order_created_datetime.value_rm AS order_value_rm , - transaction_orders_get_next_order_created_datetime.service_charge_rm AS order_service_charge_rm , - transaction_orders_get_next_order_created_datetime.tax_rm AS order_tax_rm , - transaction_orders_get_next_order_created_datetime.total_value_rm AS total_order_value_rm, + transaction_orders_get_next_order_created_datetime.payment_reference AS order_payment_reference, + transaction_orders_get_next_order_created_datetime.bill_number AS order_bill_number, + transaction_orders_get_next_order_created_datetime.is_first_time_company AS is_first_time_order_company, + transaction_orders_get_next_order_created_datetime.is_first_time_company_completed AS is_first_time_order_company_completed, + transaction_orders_get_next_order_created_datetime.is_first_time_user AS is_first_time_order_user, + transaction_orders_get_next_order_created_datetime.is_first_time_user_completed AS is_first_time_order_user_completed, + transaction_orders_get_next_order_created_datetime.base_to_quote_currency_exchange_rate AS order_base_to_quote_currency_exchange_rate , + transaction_orders_get_next_order_created_datetime.base_value AS order_base_value , + transaction_orders_get_next_order_created_datetime.base_service_charge AS order_base_service_charge , + transaction_orders_get_next_order_created_datetime.base_tax AS order_base_tax , + transaction_orders_get_next_order_created_datetime.quote_value AS order_quote_value , + transaction_orders_get_next_order_created_datetime.value_rm AS order_value_rm , + transaction_orders_get_next_order_created_datetime.service_charge_rm AS order_service_charge_rm , + transaction_orders_get_next_order_created_datetime.tax_rm AS order_tax_rm , + transaction_orders_get_next_order_created_datetime.total_value_rm AS total_order_value_rm, transaction_orders_get_next_order_created_datetime.order_created_datetime, - order_created_dates.first_day_of_week AS order_created_week, - + order_created_dates.first_day_of_week AS order_created_week, + transaction_orders_get_next_order_created_datetime.order_pending_submission_datetime, transaction_orders_get_next_order_created_datetime.order_pending_verification_datetime, transaction_orders_get_next_order_created_datetime.order_approved_datetime, @@ -108,22 +108,22 @@ fct_and_dim_joins AS ( transaction_orders_get_next_order_created_datetime.order_suspended_datetime, transaction_orders_get_next_order_created_datetime.next_order_created_datetime, - transaction_costs.transaction_cost_id AS cost_id, - transaction_costs.bank_id AS currency_vendor_bank_id, - transaction_costs.transaction_type AS cost_transaction_type, - transaction_costs.payment_method AS cost_payment_method, - transaction_costs.status AS cost_status, - transaction_costs.payment_reference AS cost_payment_reference, - transaction_costs.bill_number AS cost_bill_number, - transaction_costs.base_value AS cost_base_value, - transaction_costs.quote_value AS cost_quote_value, + transaction_costs.transaction_cost_id AS cost_id, + transaction_costs.bank_id AS currency_vendor_bank_id, + transaction_costs.transaction_type AS cost_transaction_type, + transaction_costs.payment_method AS cost_payment_method, + transaction_costs.status AS cost_status, + transaction_costs.payment_reference AS cost_payment_reference, + transaction_costs.bill_number AS cost_bill_number, + transaction_costs.base_value AS cost_base_value, + transaction_costs.quote_value AS cost_quote_value, transaction_costs.base_to_quote_currency_exchange_rate AS cost_base_to_quote_currency_exchange_rate, - transaction_costs.base_tax AS cost_base_tax, - transaction_costs.base_service_charge AS cost_base_service_charge, - transaction_costs.value_rm AS cost_value_rm, - transaction_costs.tax_rm AS cost_tax_rm, - transaction_costs.service_charge_rm AS cost_service_charge_rm, - transaction_costs.total_value_rm AS total_cost_value_rm, + transaction_costs.base_tax AS cost_base_tax, + transaction_costs.base_service_charge AS cost_base_service_charge, + transaction_costs.value_rm AS cost_value_rm, + transaction_costs.tax_rm AS cost_tax_rm, + transaction_costs.service_charge_rm AS cost_service_charge_rm, + transaction_costs.total_value_rm AS total_cost_value_rm, transaction_costs.cost_created_datetime, transaction_costs.cost_pending_submission_datetime, transaction_costs.cost_pending_verification_datetime, @@ -144,16 +144,16 @@ fct_and_dim_joins AS ( LEFT JOIN companies ON (bookings.company_id = companies.company_id) - LEFT JOIN dates AS order_created_dates - ON (transaction_orders_get_next_order_created_datetime.order_created_datetime = order_created_dates.date_day) + LEFT JOIN dates AS order_created_dates + ON (DATE(transaction_orders_get_next_order_created_datetime.order_created_datetime) = order_created_dates.date_day) - LEFT JOIN currencies AS fix_currencies + LEFT JOIN currencies AS fix_currencies ON (bookings.fix_currency_id = fix_currencies.currency_id) - LEFT JOIN currencies AS quote_currencies + LEFT JOIN currencies AS quote_currencies ON (bookings.quote_currency_id = quote_currencies.currency_id) - LEFT JOIN currencies AS base_currencies + LEFT JOIN currencies AS base_currencies ON (bookings.base_currency_id = base_currencies.currency_id) ), @@ -258,4 +258,4 @@ final__rep_exchange__daily_orders AS ( FROM fct_and_dim_joins ) -SELECT * FROM final__rep_exchange__daily_orders \ No newline at end of file +SELECT * FROM final__rep_exchange__daily_orders