ok
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
"name": "groovebrew-mockup",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"homepage": "https://dev.kedaimaster.com",
|
||||
"homepage": "https://kedaimaster.com",
|
||||
"dependencies": {
|
||||
"@emotion/react": "^11.13.3",
|
||||
"@emotion/styled": "^11.13.0",
|
||||
|
||||
@@ -76,6 +76,7 @@
|
||||
transition: all 0.5s ease-in-out;
|
||||
}
|
||||
.bussinessName h2 {
|
||||
font-size: 18px;
|
||||
overflow-wrap: break-word;
|
||||
color: inherit; /* Ensures that it inherits the color from the parent */
|
||||
}
|
||||
|
||||
@@ -108,7 +108,7 @@ export function MusicPlayer({ socket, shopId, user, shopOwnerId, isSpotifyNeedLo
|
||||
// setSubtitleColor("white");
|
||||
// setSubtitleBG("black");
|
||||
// }
|
||||
const proxiedUrl = `https://dev.api.kedaimaster.com/image?url=${encodeURIComponent(modifyUrl(imageUrl))}`; // Use your proxy to fetch the image
|
||||
const proxiedUrl = `https://api.kedaimaster.com/image?url=${encodeURIComponent(modifyUrl(imageUrl))}`; // Use your proxy to fetch the image
|
||||
|
||||
setBackgroundImage(proxiedUrl);
|
||||
} catch (error) {
|
||||
|
||||
@@ -14,6 +14,7 @@ const SetPaymentQr = ({ shopId,
|
||||
const [qrPosition, setQrPosition] = useState([50, 50]);
|
||||
const [qrSize, setQrSize] = useState(50);
|
||||
const [qrPayment, setQrPayment] = useState();
|
||||
const [qrPaymentFile, setQrPaymentFile] = useState();
|
||||
const [qrCodeDetected, setQrCodeDetected] = useState(false);
|
||||
const [isNeedConfirmationState, setIsNeedConfirmationState] = useState(0);
|
||||
const [isQRISavailable, setIsQRISavailable] = useState(0);
|
||||
@@ -57,6 +58,7 @@ const SetPaymentQr = ({ shopId,
|
||||
if (file) {
|
||||
const newqrPayment = URL.createObjectURL(file);
|
||||
setQrPayment(newqrPayment);
|
||||
setQrPaymentFile(file);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -83,13 +85,14 @@ const SetPaymentQr = ({ shopId,
|
||||
|
||||
// Save cafe details
|
||||
const handleSave = async () => {
|
||||
let qrPaymentFile;
|
||||
if(qrPaymentInputRef?.current?.files[0])
|
||||
qrPaymentFile = qrPaymentInputRef.current.files[0];
|
||||
let qrPaymentFileCache;
|
||||
if(qrPaymentFile != null)
|
||||
qrPaymentFileCache = qrPaymentFile;
|
||||
|
||||
const details = {
|
||||
qrPosition,
|
||||
qrSize,
|
||||
qrPaymentFile,
|
||||
qrPaymentFile: qrPaymentFileCache,
|
||||
isQRISavailable: isQRISavailable === 1,
|
||||
isOpenBillAvailable: isOpenBillAvailable === 1,
|
||||
isNeedConfirmationState: isNeedConfirmationState === 1
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
// src/config.js
|
||||
|
||||
const API_BASE_URL = 'https://dev.api.kedaimaster.com';
|
||||
const API_BASE_URL = 'https://api.kedaimaster.com';
|
||||
|
||||
export default API_BASE_URL;
|
||||
|
||||
@@ -290,7 +290,7 @@ export default function Transactions({
|
||||
)}
|
||||
</button>
|
||||
:
|
||||
(transaction.payment_type != 'paylater/cash' && transaction.payment_type != 'paylater/cashless' || isPaymentOpen &&
|
||||
((transaction.payment_type != 'paylater/cash' && transaction.payment_type != 'paylater/cashless' || isPaymentOpen) &&
|
||||
<h5
|
||||
className={`${styles.DeclineButton}`}
|
||||
onClick={() =>
|
||||
|
||||
Reference in New Issue
Block a user