Merge branch 'coldfix' into 'dev'

COLDFIX

See merge request !35

package.json

@@ -33,7 +33,7 @@
     "text-mask-addons": "^3.8.0"
   },
   "scripts": {
-    "start": "cross-env REACT_APP_BASE_URL=https://pilar-be-dev.cs.ui.ac.id parcel public/index.html",
+    "start": "cross-env REACT_APP_BASE_URL=$(grep REACT_APP_BASE_URL .env_var | cut -d '=' -f2) parcel public/index.html",
     "build": "cross-env REACT_APP_BASE_URL=$(grep REACT_APP_BASE_URL .env_var | cut -d '=' -f2) parcel build public/index.html",
     "test": "jest",
     "test:coverage": "jest --coverage",

src/component/TableUtils.jsx

@@ -68,7 +68,7 @@ export const itemDonationStatus = (donation) => {
 }
 
 export const preorderStock = (product) => (
-  <div>{product.pre_order ? "preorder" : product.stock}</div>
+  <div>{product.preorder ? "preorder" : product.stock}</div>
 );
 
 export const donasiProgram = (program) => (

src/page/produk/ListProduk.jsx

@@ -15,6 +15,7 @@ const ListProduk = () => {
     keyValuePairs: [
       ["id", "id"],
       ["name", "Nama Produk"],
+      ["preorder_duration", "Preorder Duration"],
       ["", "Stok", preorderStock],
       ["unit", "Satuan"],
       ["price", "Harga Satuan", stringToCurrency],