feat: Complete overhaul

BREAKING CHANGE: Reworked the entire plugin
oblakstudio · Nov 30, 2022 · 8d58f32 · 8d58f32
1 parent e10868e
commit 8d58f32
Show file tree

Hide file tree

Showing 33 changed files with 1,791 additions and 863 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,20 +1,24 @@
-# editorconfig.org
-
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.php]
-indent_size = 4
-
-[*.scss]
-indent_size = 2
-
-[*.js]
-indent_size = 2
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.php]
+indent_size = 4
+
+[*.scss]
+indent_size = 2
+
+[*.js]
+indent_size = 2
+
+[{composer.json,package.json}]
+indent_size = 4
+
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1,2 @@
 *.* @seebeen
+*.* @oblakbot
diff --git a/.github/scripts/release.sh b/.github/scripts/release.sh
@@ -5,6 +5,7 @@ NEXT_VERSION=$1
 CURRENT_VERSION=$(cat $PROJECT_NAME.php | grep "Version" | head -1 | awk -F= "{ print $2 }" | sed 's/[* Version:,\",]//g' | tr -d '[[:space:]]')
 
 sed -i "s/Version:              $CURRENT_VERSION/Version:              $NEXT_VERSION/g" serbian-addons-for-woocommerce.php
+sed -i "s/'$CURRENT_VERSION'/'$NEXT_VERSION'/g" lib/Serbian_WooCommerce.php
 sed -i "s/Stable tag: $CURRENT_VERSION/Stable tag: $NEXT_VERSION/g" ./.wordpress-org/readme.txt
 
 rm -f /tmp/release.zip

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -1,57 +1,57 @@
-name: Build and release
-on:
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - '.wordpress-org/**'
-      - '.github/workflows/wp-deploy.yml'
-      - '.github/workflows/wp-assets.yml'
-      - '.github/scripts/deploy.sh'
-      - 'README.md'
-      - 'CHANGELOG.md'
-      - '.codeclimate.yml'
-
-jobs:
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2.3.4
-        with:
-          fetch-depth: 0
-      - name: Setup Node.js
-        uses: actions/setup-node@v2.4.0
-        with:
-          node-version: 16
-          cache: yarn
-      - name: Cache Composer dependencies
-        uses: actions/cache@v2.1.6
-        with:
-          path: /tmp/composer-cache
-          key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
-      - name: Install composer dependencies
-        uses: php-actions/composer@v6
-        with:
-          php_version: 7.4
-          version: 2
-          dev: no
-          quiet: yes
-          args: --optimize-autoloader --classmap-authoritative --prefer-dist
-      - name: Install Yarn dependencies
-        run: yarn install
-      - name: Lint
-        run: yarn lint
-      - name: Build
-        run: "yarn build:production"
-      - name: Release
-        env:
-          GIT_AUTHOR_NAME: "oblakbot"
-          GIT_AUTHOR_EMAIL: "sibin.grasic+bot@oblak.studio"
-          GIT_COMMITTER_NAME: "oblakbot"
-          GIT_COMMITTER_EMAIL: 'sibin.grasic+bot@oblak.studio'
-          GITHUB_TOKEN: ${{ secrets.OBLAK_BOT_TOKEN }}
-        run: yarn run semantic-release
-
-
+name: Build and release
+on:
+  push:
+    branches:
+      - master
+    paths-ignore:
+      - '.wordpress-org/**'
+      - '.github/workflows/wp-deploy.yml'
+      - '.github/workflows/wp-assets.yml'
+      - '.github/scripts/deploy.sh'
+      - 'README.md'
+      - 'CHANGELOG.md'
+      - '.codeclimate.yml'
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: yarn
+      - name: Cache Composer dependencies
+        uses: actions/cache@v2.1.6
+        with:
+          path: /tmp/composer-cache
+          key: ${{ runner.os }}-${{ hashFiles('**/composer.lock') }}
+      - name: Install composer dependencies
+        uses: php-actions/composer@v6
+        with:
+          php_version: 7.3
+          version: 2
+          dev: no
+          quiet: yes
+          args: --optimize-autoloader --classmap-authoritative --prefer-dist
+      - name: Install Yarn dependencies
+        run: yarn install
+      - name: Lint
+        run: yarn lint
+      - name: Build
+        run: "yarn build:production"
+      - name: Release
+        env:
+          GIT_AUTHOR_NAME: "oblakbot"
+          GIT_AUTHOR_EMAIL: "sibin.grasic+bot@oblak.studio"
+          GIT_COMMITTER_NAME: "oblakbot"
+          GIT_COMMITTER_EMAIL: 'sibin.grasic+bot@oblak.studio'
+          GITHUB_TOKEN: ${{ secrets.OBLAK_BOT_TOKEN }}
+        run: yarn run semantic-release
+
+
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
diff --git a/.wordpress-org/readme.txt b/.wordpress-org/readme.txt
@@ -3,8 +3,8 @@ Contributors: oblakstudio, seebeen
 Donate link: https://srbizasrbe.org
 Tags: serbia, woocommerce, woocommerce-serbia
 Requires at least: 5.6
-Tested up to: 5.8
-Requires PHP: 7.2
+Tested up to: 6.1
+Requires PHP: 7.3
 Stable tag: 1.2.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

diff --git a/assets/styles/components/_billing_fields.scss b/assets/styles/components/_billing_fields.scss
@@ -1,22 +1,26 @@
-.woocommerce-checkout,
-.woocommerce-edit-address {
-  .woocommerce-billing-fields,
-  .woocommerce-address-fields {
-    .entity-type-control {
-      .woocommerce-input-wrapper {
-        label {
-          display: inline-block;
-          margin-right: 10px;
-        }
-      }
-    }
-
-    .hide-if-person {
-      display: none;
-
-      &.shown {
-        display: block;
-      }
-    }
-  }
-}
+.woocommerce-checkout,
+.woocommerce-edit-address {
+  .woocommerce-billing-fields,
+  .woocommerce-address-fields {
+    .entity-type-control {
+      .woocommerce-input-wrapper {
+        label {
+          display: inline-block;
+          margin-right: 10px;
+        }
+
+        .description {
+          display: block !important;
+        }
+      }
+    }
+
+    .hide-if-person {
+      display: none;
+
+      &.shown {
+        display: block;
+      }
+    }
+  }
+}
diff --git a/composer.json b/composer.json
@@ -1,11 +1,31 @@
 {
-    "autoload": {
-        "psr-4": {
-            "Oblak\\WCRS\\": "lib/"
-        }
-    },
-    "require": {
-        "oblak/serbian-validators": "^1.0",
-        "oblak/asset-loader": "^1.1"
+  "autoload": {
+    "psr-4": {
+        "Oblak\\WCRS\\": "lib/"
     }
+  },
+  "require": {
+      "oblak/asset-loader": "^1",
+      "oblak/serbian-validators": "^1.0",
+      "oblak/wp-plugin-installer": "^1"
+  },
+  "require-dev": {
+      "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
+      "wp-coding-standards/wpcs": "*",
+      "phpcompatibility/phpcompatibility-wp": "*",
+      "woocommerce/woocommerce-sniffs": "^0.1.2"
+  },
+  "scripts": {
+      "install-codestandards": [
+          "Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run"
+      ],
+      "post-install-cmd": [
+          "@install-codestandards"
+      ]
+  },
+  "config": {
+      "allow-plugins": {
+          "dealerdirect/phpcodesniffer-composer-installer": true
+      }
+  }
 }