Merge branch 'new-release' of https://bitbucket.org/altafixco/next-indoteknik into biteship-merge

# Conflicts:
#	src/lib/checkout/components/Checkout.jsx
#	src/lib/transaction/components/Transaction.jsx

3 files changed, 37 insertions, 0 deletions

diff --git a/src/lib/merchant/api/createMerchantApi.js b/src/lib/merchant/api/createMerchantApi.js
new file mode 100644
index 00000000..878ab7c0
--- /dev/null
+++ b/src/lib/merchant/api/createMerchantApi.js
@@ -0,0 +1,14 @@
+// import odooApi from '@/core/api/odooApi';
+// import { getAuth } from '@/core/utils/auth';
+
+// const createMerchantApi = async ({ data }) => {
+//   const auth = getAuth();
+//   const lead = await odooApi(
+//     'POST',
+//     `/api/v1/merchant/${auth.partnerId}`,
+//     data
+//   );
+//   return lead;
+// };
+
+// export default createMerchantApi;
diff --git a/src/lib/merchant/api/getMerchantApi.js b/src/lib/merchant/api/getMerchantApi.js
new file mode 100644
index 00000000..be27e947
--- /dev/null
+++ b/src/lib/merchant/api/getMerchantApi.js
@@ -0,0 +1,13 @@
+// import odooApi from '@/core/api/odooApi';
+// import { getAuth } from '@/core/utils/auth';
+
+// const createMerchantApi = async () => {
+//   const auth = getAuth();
+//   const lead = await odooApi(
+//     'GET',
+//     `/api/v1/detail-merchant/${auth.partnerId}`
+//   );
+//   return lead;
+// };
+
+// export default createMerchantApi;
diff --git a/src/lib/merchant/api/getMerchantProgresApi.js b/src/lib/merchant/api/getMerchantProgresApi.js
new file mode 100644
index 00000000..3bec15fe
--- /dev/null
+++ b/src/lib/merchant/api/getMerchantProgresApi.js
@@ -0,0 +1,10 @@
+// import odooApi from '@/core/api/odooApi';
+// import { getAuth } from '@/core/utils/auth';
+
+// const createMerchantApi = async () => {
+//   const auth = getAuth();
+//   const lead = await odooApi('GET', `/api/v1/check-merchant/${auth.partnerId}`);
+//   return lead;
+// };
+
+// export default createMerchantApi;