kediritechnopark/kedaimaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ok

Browse Source
This commit is contained in:
everythingonblack
2025-05-07 09:14:55 +07:00
parent 97f1fd7bfc
commit 92280ffdd3
6 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -2,7 +2,7 @@
"name": "groovebrew-mockup", "name": "groovebrew-mockup",
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"homepage": "https://dev.kedaimaster.com", "homepage": "https://kedaimaster.com",
"dependencies": { "dependencies": {
"@emotion/react": "^11.13.3", "@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0", "@emotion/styled": "^11.13.0",

1
src/components/ButtonWithReplica.css
View File

@@ -76,6 +76,7 @@
transition: all 0.5s ease-in-out; transition: all 0.5s ease-in-out;
} }
.bussinessName h2 { .bussinessName h2 {
font-size: 18px;
overflow-wrap: break-word; overflow-wrap: break-word;
color: inherit; /* Ensures that it inherits the color from the parent */ color: inherit; /* Ensures that it inherits the color from the parent */
} }

2
src/components/MusicPlayer.js
View File

@@ -108,7 +108,7 @@ export function MusicPlayer({ socket, shopId, user, shopOwnerId, isSpotifyNeedLo
// setSubtitleColor("white"); // setSubtitleColor("white");
// setSubtitleBG("black"); // 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); setBackgroundImage(proxiedUrl);
} catch (error) { } catch (error) {

11
src/components/PaymentOptions.js
View File

@@ -14,6 +14,7 @@ const SetPaymentQr = ({ shopId,
const [qrPosition, setQrPosition] = useState([50, 50]); const [qrPosition, setQrPosition] = useState([50, 50]);
const [qrSize, setQrSize] = useState(50); const [qrSize, setQrSize] = useState(50);
const [qrPayment, setQrPayment] = useState(); const [qrPayment, setQrPayment] = useState();
const [qrPaymentFile, setQrPaymentFile] = useState();
const [qrCodeDetected, setQrCodeDetected] = useState(false); const [qrCodeDetected, setQrCodeDetected] = useState(false);
const [isNeedConfirmationState, setIsNeedConfirmationState] = useState(0); const [isNeedConfirmationState, setIsNeedConfirmationState] = useState(0);
const [isQRISavailable, setIsQRISavailable] = useState(0); const [isQRISavailable, setIsQRISavailable] = useState(0);
@@ -57,6 +58,7 @@ const SetPaymentQr = ({ shopId,
if (file) { if (file) {
const newqrPayment = URL.createObjectURL(file); const newqrPayment = URL.createObjectURL(file);
setQrPayment(newqrPayment); setQrPayment(newqrPayment);
setQrPaymentFile(file);
} }
}; };
@@ -83,13 +85,14 @@ const SetPaymentQr = ({ shopId,
// Save cafe details // Save cafe details
const handleSave = async () => { const handleSave = async () => {
let qrPaymentFile; let qrPaymentFileCache;
if(qrPaymentInputRef?.current?.files[0]) if(qrPaymentFile != null)
qrPaymentFile = qrPaymentInputRef.current.files[0]; qrPaymentFileCache = qrPaymentFile;
const details = { const details = {
qrPosition, qrPosition,
qrSize, qrSize,
qrPaymentFile, qrPaymentFile: qrPaymentFileCache,
isQRISavailable: isQRISavailable === 1, isQRISavailable: isQRISavailable === 1,
isOpenBillAvailable: isOpenBillAvailable === 1, isOpenBillAvailable: isOpenBillAvailable === 1,
isNeedConfirmationState: isNeedConfirmationState === 1 isNeedConfirmationState: isNeedConfirmationState === 1

2
src/config.js
View File

@@ -1,5 +1,5 @@
// src/config.js // 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; export default API_BASE_URL;

2
src/pages/Transaction_confirmed.js
View File

@@ -290,7 +290,7 @@ export default function Transactions({
)} )}
</button> </button>
: :
(transaction.payment_type != 'paylater/cash' && transaction.payment_type != 'paylater/cashless' || isPaymentOpen && ((transaction.payment_type != 'paylater/cash' && transaction.payment_type != 'paylater/cashless' || isPaymentOpen) &&
<h5 <h5
className={`${styles.DeclineButton}`} className={`${styles.DeclineButton}`}
onClick={() => onClick={() =>