cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/137-project-upgrade-update-1A' into vapor/test

Browse Source
This commit is contained in:
Dillon Ngo
2026-07-01 12:17:02 +08:00
parent 3cafd3eb35 46862b014a
commit 7057b78f88
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.testing
+1 -1
View File
@@ -5,7 +5,7 @@ APP_KEY=base64:utnZQgraE9iHT+4xCoDP2p7MdQmBweGyP0b6Mp1ksds=
JWT_SECRET=4DlpggxJJeV1nVeHPPf83mSGsoJEmA8bpuSFdFN0VCvwqkE084iYOqoed0q47Ee2
DB_CONNECTION=mysql
DB_HOST=172.18.0.2
DB_HOST=mysql
DB_PORT=3306
DB_DATABASE=ci_test_exchange
DB_USERNAME=ci
docker-setup/docker-compose.yml
+3 -3
View File
@@ -7,7 +7,7 @@ services:
#################################################################
nginx:
image: nginx:stable-alpine
container_name: exchange-2-ngnix
container_name: exchange-ngnix
ports:
- "8082:80"
volumes:
@@ -21,7 +21,7 @@ services:
#################################################################
mysql:
image: mysql:5.7.29
container_name: exchange-2-mysql
container_name: exchange-mysql
restart: unless-stopped
tty: true
ports:
@@ -42,7 +42,7 @@ services:
build:
context: .
dockerfile: Dockerfile
container_name: exchange-2-php
container_name: exchange-php
volumes:
- ../:/var/www/html
- ./php/default.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
resources/assets/vue/components/bookings/forms/SupplierWhiteFormPlaceOrderFormComponent.vue
+1 -1
View File
@@ -110,7 +110,7 @@
</div>
<list-component :key="supplierRefundListKey" section="supplierRefundListSection" :options="{'per_page': 20, 'type': 15, 'currency_rate_is_not_equal': 1, ...(supplier.id == 4548 && { 'created_after_or_equal': '01-08-2024' }), 'status': 2, 'receiver_in': [supplier.id]}" :endpoint="route('api.transaction.list')">
<template #list="{ data }">
<supplier-refund-component section="supplierRefundListSection" :data="data" :is1688Supplier="is1688Supplier" :payments="payments" :supplierRefunds="supplierRefunds" :refundTotal="refundTotal" :paymentTotal="paymentTotal" :inputPaymentTotal="inputPaymentTotal" @input="refundOrder($event)"></supplier-refund-component>
<supplier-refund-component section="supplierRefundListSection" :data="data" :is1688Supplier="is1688Supplier" :payments="payments" :supplierRefunds="supplierRefunds" :refundTotal="refundTotal" :paymentTotal="paymentTotal" :inputPaymentTotal="inputPaymentTotal" @update:modelValue="refundOrder($event)"></supplier-refund-component>
</template>
</list-component>
</div>