Compare commits

...

6 Commits

Author SHA1 Message Date
Ahmed Bouhuolia
dbd2f77d12 chore: update mysql docker container restart policy 2023-07-23 20:03:57 +02:00
Ahmed Bouhuolia
ef5ef647d4 chore: change docker restart policy to unless-stopped 2023-07-23 19:54:55 +02:00
Suhaib Affan
ce62a0524c Added restart policy to docker compose files. 2023-07-19 20:19:56 -04:00
Ahmed Bouhuolia
278c8a01c5 Merge remote-tracking branch 'refs/remotes/origin/develop' into develop 2023-07-18 20:03:31 +02:00
Ahmed Bouhuolia
f22dc9a18b fix(webapp): assign currency code of customer/vendor to the transaction form. 2023-07-18 20:02:45 +02:00
Ahmed Bouhuolia
b224a2c313 Merge pull request #196 from bigcapitalhq/fix-loading-status-on-financial-reports
fix(webapp): show loading message of cost computing job on financial reports
2023-07-17 01:51:02 +02:00
10 changed files with 36 additions and 10 deletions

View File

@@ -21,10 +21,16 @@ services:
depends_on: depends_on:
- server - server
- webapp - webapp
deploy:
restart_policy:
condition: unless-stopped
webapp: webapp:
container_name: bigcapital-webapp container_name: bigcapital-webapp
image: ghcr.io/bigcapitalhq/webapp:latest image: ghcr.io/bigcapitalhq/webapp:latest
deploy:
restart_policy:
condition: unless-stopped
server: server:
container_name: bigcapital-server container_name: bigcapital-server
@@ -37,6 +43,9 @@ services:
- mysql - mysql
- mongo - mongo
- redis - redis
deploy:
restart_policy:
condition: unless-stopped
environment: environment:
# Mail # Mail
- MAIL_HOST=${MAIL_HOST} - MAIL_HOST=${MAIL_HOST}
@@ -93,6 +102,9 @@ services:
mysql: mysql:
container_name: bigcapital-mysql container_name: bigcapital-mysql
deploy:
restart_policy:
condition: unless-stopped
build: build:
context: ./docker/mariadb context: ./docker/mariadb
environment: environment:
@@ -107,6 +119,9 @@ services:
mongo: mongo:
container_name: bigcapital-mongo container_name: bigcapital-mongo
deploy:
restart_policy:
condition: unless-stopped
build: ./docker/mongo build: ./docker/mongo
expose: expose:
- '27017' - '27017'
@@ -115,6 +130,9 @@ services:
redis: redis:
container_name: bigcapital-redis container_name: bigcapital-redis
deploy:
restart_policy:
condition: unless-stopped
build: build:
context: ./docker/redis context: ./docker/redis
expose: expose:

View File

@@ -20,6 +20,9 @@ services:
- '3306' - '3306'
ports: ports:
- '3306:3306' - '3306:3306'
deploy:
restart_policy:
condition: unless-stopped
mongo: mongo:
build: ./docker/mongo build: ./docker/mongo
@@ -29,6 +32,9 @@ services:
- mongo:/var/lib/mongodb - mongo:/var/lib/mongodb
ports: ports:
- '27017:27017' - '27017:27017'
deploy:
restart_policy:
condition: unless-stopped
redis: redis:
build: build:
@@ -37,6 +43,9 @@ services:
- "6379" - "6379"
volumes: volumes:
- redis:/data - redis:/data
deploy:
restart_policy:
condition: unless-stopped
# Volumes # Volumes
volumes: volumes:

View File

@@ -176,7 +176,7 @@ function BillFormVendorField() {
name={'vendor_id'} name={'vendor_id'}
items={vendors} items={vendors}
placeholder={<T id={'select_vender_account'} />} placeholder={<T id={'select_vender_account'} />}
onItemChange={(contact) => { onItemSelect={(contact) => {
setFieldValue('vendor_id', contact.id); setFieldValue('vendor_id', contact.id);
setFieldValue('currency_code', contact?.currency_code); setFieldValue('currency_code', contact?.currency_code);
}} }}

View File

@@ -85,7 +85,6 @@ function VendorCreditNoteFormHeaderFields({
name={'exchange_rate'} name={'exchange_rate'}
formGroupProps={{ label: ' ', inline: true }} formGroupProps={{ label: ' ', inline: true }}
/> />
{/* ------- Vendor Credit date ------- */} {/* ------- Vendor Credit date ------- */}
<FastField name={'vendor_credit_date'}> <FastField name={'vendor_credit_date'}>
{({ form, field: { value }, meta: { error, touched } }) => ( {({ form, field: { value }, meta: { error, touched } }) => (
@@ -194,7 +193,7 @@ function VendorCreditFormVendorSelect() {
name={'vendor_id'} name={'vendor_id'}
items={vendors} items={vendors}
placeholder={<T id={'select_vender_account'} />} placeholder={<T id={'select_vender_account'} />}
onItemChange={(contact) => { onItemSelect={(contact) => {
setFieldValue('vendor_id', contact.id); setFieldValue('vendor_id', contact.id);
setFieldValue('currency_code', contact?.currency_code); setFieldValue('currency_code', contact?.currency_code);
}} }}

View File

@@ -248,7 +248,7 @@ function PaymentFormVendorSelect() {
name={'vendor_id'} name={'vendor_id'}
items={vendors} items={vendors}
placeholder={<T id={'select_vender_account'} />} placeholder={<T id={'select_vender_account'} />}
onItemChange={(contact) => { onItemSelect={(contact) => {
setFieldValue('vendor_id', contact.id); setFieldValue('vendor_id', contact.id);
setFieldValue('currency_code', contact?.currency_code); setFieldValue('currency_code', contact?.currency_code);
setPaymentVendorId(contact.id); setPaymentVendorId(contact.id);

View File

@@ -110,7 +110,7 @@ function CreditNoteCustomersSelect() {
name={'customer_id'} name={'customer_id'}
items={customers} items={customers}
placeholder={<T id={'select_customer_account'} />} placeholder={<T id={'select_customer_account'} />}
onItemChange={(customer) => { onItemSelect={(customer) => {
setFieldValue('customer_id', customer.id); setFieldValue('customer_id', customer.id);
setFieldValue('currency_code', customer?.currency_code); setFieldValue('currency_code', customer?.currency_code);
}} }}

View File

@@ -165,7 +165,7 @@ function EstimateFormCustomerSelect() {
name={'customer_id'} name={'customer_id'}
items={customers} items={customers}
placeholder={<T id={'select_customer_account'} />} placeholder={<T id={'select_customer_account'} />}
onItemChange={(customer) => { onItemSelect={(customer) => {
setFieldValue('customer_id', customer.id); setFieldValue('customer_id', customer.id);
setFieldValue('currency_code', customer?.currency_code); setFieldValue('currency_code', customer?.currency_code);
}} }}

View File

@@ -178,7 +178,7 @@ function InvoiceFormCustomerSelect() {
name={'customer_id'} name={'customer_id'}
items={customers} items={customers}
placeholder={<T id={'select_customer_account'} />} placeholder={<T id={'select_customer_account'} />}
onItemChange={(customer) => { onItemSelect={(customer) => {
setFieldValue('customer_id', customer.id); setFieldValue('customer_id', customer.id);
setFieldValue('currency_code', customer?.currency_code); setFieldValue('currency_code', customer?.currency_code);
}} }}

View File

@@ -263,7 +263,7 @@ function PaymentReceiveCustomerSelect() {
name={'customer_id'} name={'customer_id'}
items={customers} items={customers}
placeholder={<T id={'select_customer_account'} />} placeholder={<T id={'select_customer_account'} />}
onItemChange={(customer) => { onItemSelect={(customer) => {
setFieldValue('customer_id', customer.id); setFieldValue('customer_id', customer.id);
setFieldValue('full_amount', ''); setFieldValue('full_amount', '');
setFieldValue('currency_code', customer?.currency_code); setFieldValue('currency_code', customer?.currency_code);

View File

@@ -162,7 +162,7 @@ function ReceiptFormCustomerSelect() {
name={'customer_id'} name={'customer_id'}
items={customers} items={customers}
placeholder={<T id={'select_customer_account'} />} placeholder={<T id={'select_customer_account'} />}
onItemChange={(customer) => { onItemSelect={(customer) => {
setFieldValue('customer_id', customer.id); setFieldValue('customer_id', customer.id);
setFieldValue('currency_code', customer?.currency_code); setFieldValue('currency_code', customer?.currency_code);
}} }}