added alter table for merchant order and merchant contract terms

1 files changed, 21 insertions, 0 deletions

diff --git a/src/backenddb/merchant-0004.sql b/src/backenddb/merchant-0004.sql
index 0696886d..fec64fd2 100644
--- a/src/backenddb/merchant-0004.sql
+++ b/src/backenddb/merchant-0004.sql
@@ -111,6 +111,7 @@ COMMENT ON COLUMN merchant_kyc.aml_decision
 
 
 ALTER TABLE merchant_orders
+<<<<<<< HEAD
   ADD COLUMN pos_key VARCHAR;
 COMMENT ON COLUMN merchant_orders.pos_key
   IS 'point-of-sale key which is used for the verification of payment';
@@ -120,6 +121,26 @@ ALTER TABLE merchant_contract_terms
   ADD COLUMN pos_key VARCHAR;
 COMMENT  ON COLUMN merchant_contract_terms.pos_key
   IS 'point-of-sale key which is used for the verification of payment';
+=======
+  ADD COLUMN pos_key VARCHAR DEFAULT NULL;
+  ADD COLUMN pricing_algorithm INT8;
+
+COMMENT ON COLUMN merchant_orders.pos_key
+  IS 'encoded based key which is used for the verification of payment';
+COMMENT ON COLUMN merchant_orders.pricing_algorithm
+  IS 'algorithm to put the price of the order. It is link with the pos_key';
+
+
+
+ALTER TABLE merchant_contract_terms
+  ADD COLUMN pos_key VARCHAR DEFAULT NULL;
+  ADD COLUMN pricing_algorithm INT8;
+
+COMMENT  ON COLUMN merchant_contract_terms.pos_key
+  IS 'enconded based key which is used for the verification of payment';
+COMMENT ON COLUMN merchant_orders.pricing_algorithm
+  IS 'algorithm to put the price of the order. It is link with the pos_key';
+>>>>>>> 43030855 (added alter table for merchant order and merchant contract terms)
 
 
 COMMIT;