diff --git a/backend.dockerfile b/backend.dockerfile index 285710c..b638aa8 100644 --- a/backend.dockerfile +++ b/backend.dockerfile @@ -35,7 +35,7 @@ ENV WP_LOGGED_IN_SALT ${WP_LOGGED_IN_SALT} ENV WP_NONCE_SALT ${WP_NONCE_SALT} ENV WP_JWT_AUTH_SECRET_KEY ${WP_JWT_AUTH_SECRET_KEY} -RUN apt-get update && apt-get install -y git unzip gnupg mysql-client +RUN apt-get update && apt-get install -y git unzip gnupg mysql-client sudo COPY docker/php/composer.phar /usr/local/bin/composer RUN chmod 755 /usr/local/bin/composer diff --git a/backend/app/plugins/wiaas/includes/class-wiaas-db-update.php b/backend/app/plugins/wiaas/includes/class-wiaas-db-update.php index 9121bb4..97e8023 100644 --- a/backend/app/plugins/wiaas/includes/class-wiaas-db-update.php +++ b/backend/app/plugins/wiaas/includes/class-wiaas-db-update.php @@ -9,7 +9,6 @@ class Wiaas_DB_Update { '20180801222206' => 'wiaas_db_update_setup_gravity', '20180802222206' => 'wiaas_db_update_add_delivery_process_forms', '20180807222206' => 'wiaas_db_update_setup_customer_capabilities', - '20180809134511' => 'wiaas_db_update_add_customer_read_permission', '20180811134511' => 'wiaas_db_update_enable_orders_access_management', '20180813134511' => 'wiaas_db_update_enable_order_numbers', '20180826153509' => 'wiaas_create_broker_access_group' diff --git a/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php b/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php index 3ce2174..86c9f30 100644 --- a/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php +++ b/backend/app/plugins/wiaas/includes/db-updates/wiaas-db-update-functions.php @@ -82,12 +82,10 @@ function wiaas_db_update_setup_customer_capabilities() { $customer_role = get_role('customer'); $customer_role->add_cap('read_private_shop_orders'); - $customer_role->add_cap('read_shop_order'); -} - -function wiaas_db_update_add_customer_read_permission() { - $role = get_role( 'customer' ); - $role->add_cap( 'read_private_products' ); + $customer_role->add_cap('read_private_products'); + $customer_role->add_cap('read_shop_order'); + $customer_role->add_cap('publish_shop_orders'); + } function wiaas_db_update_enable_orders_access_management() { diff --git a/database/.gitignore b/database/.gitignore new file mode 100644 index 0000000..7d04233 --- /dev/null +++ b/database/.gitignore @@ -0,0 +1 @@ +volume/* \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0d16029..38b809c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -54,3 +54,5 @@ services: - MYSQL_PASSWORD ports: - '23306:3306' + volumes: + - ./database/volume/:/var/lib/mysql \ No newline at end of file diff --git a/docker/php/setup.sh b/docker/php/setup.sh index d4d3cdf..cd47b5b 100644 --- a/docker/php/setup.sh +++ b/docker/php/setup.sh @@ -8,27 +8,29 @@ while ! mysqladmin ping -h"db" --silent; do done echo "Ready...." -# Apply core database updates if needed -wp core update-db --allow-root +sudo -u www-data -s -- <