From 75f6ce31408dda6a1a615379253edbec926647b4 Mon Sep 17 00:00:00 2001 From: Ollama Date: Mon, 6 Apr 2026 17:46:13 +0000 Subject: [PATCH 01/11] feat: add release workflow with automated version bumping - Add workflow_dispatch triggered release.yml with major/minor/patch options - Auto-update version in App.php, package.json, docker-compose.nginx.yml - Auto-update README.md and SECURITY.md version references - Auto-update issue templates with new version dropdowns - Generate CHANGELOG.md from git commits since last version - Build distribution archives and create draft GitHub release - Add draft_only input for testing without pushing changes Issue templates improvements: - Remove deprecated update-issue-templates.yml cron workflow - Reorganize with clear sections and visual hierarchy - Add emojis and improve placeholder text with examples - Add new fields: logs, screenshots, acceptance criteria - Add note about automatic version updates --- .github/ISSUE_TEMPLATE/bug report.yml | 314 ++++++++++++------- .github/ISSUE_TEMPLATE/feature_request.yml | 203 ++++++++---- .github/workflows/release.yml | 285 +++++++++++++++++ .github/workflows/update-issue-templates.yml | 72 ----- 4 files changed, 618 insertions(+), 256 deletions(-) create mode 100644 .github/workflows/release.yml delete mode 100644 .github/workflows/update-issue-templates.yml diff --git a/.github/ISSUE_TEMPLATE/bug report.yml b/.github/ISSUE_TEMPLATE/bug report.yml index c026d3144..fa7239534 100644 --- a/.github/ISSUE_TEMPLATE/bug report.yml +++ b/.github/ISSUE_TEMPLATE/bug report.yml @@ -1,121 +1,193 @@ -name: Bug Report -description: File a bug report -title: "[Bug]: " -labels: ["bug", "triage"] -projects: ["ospos/3", "ospos/4"] -assignees: - - none -body: - - type: markdown - attributes: - value: | - Bug reports indicate that something is not working as intended. - Please include as much detail as possible and submit a separate bug report for each problem. - Do not include personal identifying information such as email addresses or encryption keys. - - type: textarea - id: bug-description - attributes: - label: Bug Description? - description: Describe the problem that you are seeing - placeholder: "Describe the problem that you are seeing" - validations: - required: true - - type: textarea - id: steps-reproduce - attributes: - label: Steps to Reproduce? - description: List the steps to reproduce this issue - placeholder: "Steps to Reproduce" - validations: - required: true - - type: textarea - id: expected-behavior - attributes: - label: Expected Behavior? - description: Tell us what did you expect to happen? - placeholder: "Expected Behavior" - validations: - required: true - - type: dropdown - id: ospos-version - attributes: - label: OpensourcePOS Version - description: What version of our software are you running? - options: - - development (unreleased) - - opensourcepos 3.4.1 - - opensourcepos 3.4.0 - - opensourcepos 3.3.9 - - opensourcepos 3.3.8 - - opensourcepos 3.3.7 - default: 0 - validations: - required: true - - type: dropdown - id: php-version - attributes: - label: Php version - description: What version of Php? - options: - - Php 7.2 - - Php 7.3 - - Php 7.4 - - Php 8.1 - - Php 8.2 - - Php 8.3 - - Php 8.4 - default: 0 - validations: - required: true - - type: dropdown - id: browsers - attributes: - label: What browsers are you seeing the problem on? - multiple: true - options: - - Firefox - - Chrome - - Safari - - Microsoft Edge - - Other - - type: input - id: server - attributes: - label: Server Operating System and version - description: "Server Operating System " - placeholder: "Server Operating System " - validations: - required: true - - type: input - id: database - attributes: - label: Database Management System and version - description: "Database Management System" - placeholder: "Database Management" - validations: - required: true - - type: input - id: webserver - attributes: - label: Web Server and version - description: "Web Server and version " - placeholder: "Web Server and version " - validations: - required: true - - type: textarea - id: servers - attributes: - label: System Information Report (optional) - description: Copy and paste from OSPOS > Configuration > Setup & Conf > Setup & Conf? - placeholder: System Information Report - value: "System Information Report" - validations: - required: true - - type: checkboxes - id: terms - attributes: - label: Unmodified copy of OpensourcePOS - description: By submitting this issue you agree this copy has not been modified - options: - - label: I agree this copy has not been modified - required: true +name: 🐛 Bug Report +description: File a bug report to help us improve +title: "[Bug]: " +labels: ["bug", "triage"] +projects: ["ospos/3", "ospos/4"] +assignees: [] +body: + # ───────────────────────────────────────────────────────────────────────────── + # INTRODUCTION + # ───────────────────────────────────────────────────────────────────────────── + - type: markdown + attributes: + value: | + ## Thanks for taking the time to fill out this bug report! 🐜 + + Bug reports help us identify and fix issues. Please provide as much detail as possible. + + > ⚠️ **Important:** Submit a separate bug report for each problem you encounter. + > + > 🚫 Do not include personal identifying information such as email addresses or encryption keys. + + --- + + > 📝 **Note:** The version list is automatically updated when a new release is created. + > See [`.github/workflows/release.yml`](../.github/workflows/release.yml) for details. + + # ───────────────────────────────────────────────────────────────────────────── + # PROBLEM DESCRIPTION + # ───────────────────────────────────────────────────────────────────────────── + - type: textarea + id: bug-description + attributes: + label: 🐛 Bug Description + description: A clear and concise description of what the bug is. + placeholder: | + Example: When I try to print a receipt, the application crashes + with an error message saying "Unable to connect to printer". + validations: + required: true + + - type: textarea + id: steps-reproduce + attributes: + label: 📋 Steps to Reproduce + description: Detailed steps to reproduce the behavior. + placeholder: | + 1. Go to '...' + 2. Click on '...' + 3. Scroll down to '...' + 4. See error + validations: + required: true + + - type: textarea + id: expected-behavior + attributes: + label: ✅ Expected Behavior + description: A clear and concise description of what you expected to happen. + placeholder: | + Example: The receipt should print successfully without any errors. + validations: + required: true + + # ───────────────────────────────────────────────────────────────────────────── + # ENVIRONMENT DETAILS + # ───────────────────────────────────────────────────────────────────────────── + - type: dropdown + id: ospos-version + attributes: + label: 📦 OpenSourcePOS Version + description: What version of our software are you running? + options: + - development (unreleased) + - OpenSourcePOS 3.4.2 + - OpenSourcePOS 3.4.1 + - OpenSourcePOS 3.4.0 + - OpenSourcePOS 3.3.9 + - OpenSourcePOS 3.3.8 + default: 0 + validations: + required: true + + - type: dropdown + id: php-version + attributes: + label: 🔧 PHP Version + description: What version of PHP are you running? + options: + - PHP 8.4 + - PHP 8.3 + - PHP 8.2 + - PHP 8.1 + - PHP 7.4 + - PHP 7.3 + - PHP 7.2 + default: 0 + validations: + required: true + + - type: dropdown + id: browsers + attributes: + label: 🌐 Browser(s) + description: What browser(s) are you seeing the problem on? + multiple: true + options: + - Firefox + - Chrome + - Safari + - Microsoft Edge + - Other + + - type: input + id: server + attributes: + label: 🖥️ Server Operating System + description: What server OS and version are you running? + placeholder: "e.g., Ubuntu 22.04, CentOS 7, Windows Server 2022" + validations: + required: true + + - type: input + id: database + attributes: + label: 🗄️ Database + description: What database management system and version are you using? + placeholder: "e.g., MySQL 8.0, MariaDB 10.11, Percona 8.0" + validations: + required: true + + - type: input + id: webserver + attributes: + label: 🌍 Web Server + description: What web server and version are you using? + placeholder: "e.g., Apache 2.4, Nginx 1.24, Caddy 2.7" + validations: + required: true + + # ───────────────────────────────────────────────────────────────────────────── + # ADDITIONAL INFORMATION + # ───────────────────────────────────────────────────────────────────────────── + - type: textarea + id: system-info + attributes: + label: 📊 System Information Report + description: | + Copy and paste the system information from OSPOS: + + **Navigation:** Configuration → Setup & Conf → System Info + placeholder: | + Paste the System Information Report here... + render: text + validations: + required: true + + - type: textarea + id: logs + attributes: + label: 📜 Relevant Log Output + description: | + Please copy and paste any relevant log output. + + **Log locations:** + - OSPOS logs: `writable/logs/` + - Web server logs: `/var/log/apache2/` or `/var/log/nginx/` + - PHP logs: Check your `php.ini` for `error_log` location + placeholder: | + Paste log output here... + render: shell + + - type: textarea + id: screenshots + attributes: + label: 📸 Screenshots + description: If applicable, add screenshots to help explain your problem. + placeholder: Drag and drop images here... + + # ───────────────────────────────────────────────────────────────────────────── + # CONFIRMATION + # ───────────────────────────────────────────────────────────────────────────── + - type: checkboxes + id: terms + attributes: + label: ✓ Confirmation + description: Please confirm the following before submitting + options: + - label: I certify that this is an unmodified copy of OpenSourcePOS + required: true + - label: I have searched existing issues to ensure this bug has not already been reported + required: true + - label: I have provided all the information requested above + required: true \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 028fa0b3d..c5100bf40 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -1,63 +1,140 @@ -name: ✨ Feature Request -description: Suggest an idea for this project -title: "[Feature]: " -labels: ["enhancement"] -assignees: ["none"] -body: - - type: markdown - attributes: - value: | - Thanks for taking the time to fill out this feature request! 🤗 - Please make sure this feature request hasn't been already submitted by someone by looking through other open/closed issues. 😃 - - - type: dropdown - attributes: - multiple: false - label: Type of Feature - description: Select the type of feature request. - options: - - "✨ New Feature" - - "📝 Documentation" - - "🎨 Style and UI" - - "🔨 Code Refactor" - - "⚡ Performance Improvements" - - "✅ New Test" - validations: - required: true - - - type: dropdown - id: ospos-version - attributes: - label: OpensourcePOS Version - description: What version of our software are you running? - options: - - opensourcepos 3.3.9 - - opensourcepos 3.3.8 - - opensourcepos 3.3.7 - default: 0 - validations: - required: true - - - type: textarea - id: description - attributes: - label: Description - description: Give us a brief description of the feature or enhancement you would like - validations: - required: true - - - type: textarea - id: additional-information - attributes: - label: Additional Information - description: Give us some additional information on the feature request like proposed solutions, links, screenshots, etc. - - - type: checkboxes - id: terms - attributes: - label: Verify you searched open requests in OpensourcePOS - description: By submitting this request you agree that you have searched Open Requests in the Tracker - options: - - label: I agree I have searched Open Requests - required: true - +name: ✨ Feature Request +description: Suggest an idea or enhancement for this project +title: "[Feature]: " +labels: ["enhancement"] +assignees: [] +body: + # ───────────────────────────────────────────────────────────────────────────── + # INTRODUCTION + # ───────────────────────────────────────────────────────────────────────────── + - type: markdown + attributes: + value: | + ## Thanks for suggesting a new feature! 💡 + + We appreciate you taking the time to help improve OpenSourcePOS. + + > 📋 **Before submitting:** Please search [existing feature requests](https://github.com/opensourcepos/opensourcepos/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement) to ensure your idea hasn't already been suggested. + + --- + + > 📝 **Note:** The version list is automatically updated when a new release is created. + > See [`.github/workflows/release.yml`](../.github/workflows/release.yml) for details. + + # ───────────────────────────────────────────────────────────────────────────── + # FEATURE DETAILS + # ───────────────────────────────────────────────────────────────────────────── + - type: dropdown + id: feature-type + attributes: + label: 🏷️ Feature Type + description: What type of feature are you requesting? + options: + - "✨ New Feature" + - "📝 Documentation Improvement" + - "🎨 UI/UX Enhancement" + - "🔨 Code Refactoring" + - "⚡ Performance Improvement" + - "✅ New Test Coverage" + - "🔌 Plugin/Integration" + default: 0 + validations: + required: true + + - type: dropdown + id: ospos-version + attributes: + label: 📦 OpenSourcePOS Version + description: What version are you currently running? + options: + - OpenSourcePOS 3.4.2 + - OpenSourcePOS 3.4.1 + - OpenSourcePOS 3.4.0 + - OpenSourcePOS 3.3.9 + - development (unreleased) + default: 0 + validations: + required: true + + - type: textarea + id: problem-statement + attributes: + label: 🎯 Problem Statement + description: | + Is your feature request related to a problem? Please describe. + + A clear description of what the problem is. Ex: I'm always frustrated when [...] + placeholder: | + Example: I always have to manually calculate taxes for different regions, + which is time-consuming and error-prone. + validations: + required: true + + - type: textarea + id: proposed-solution + attributes: + label: 💡 Proposed Solution + description: A clear and concise description of what you want to happen. + placeholder: | + Example: Add an automatic tax calculation feature that: + - Detects the customer's region + - Applies the correct tax rate + - Generates a tax report automatically + validations: + required: true + + - type: textarea + id: alternatives + attributes: + label: 🔄 Alternatives Considered + description: A clear description of any alternative solutions or features you've considered. + placeholder: | + Example: I considered using an external tax service, but it would be + better to have this integrated directly into OpenSourcePOS. + + # ───────────────────────────────────────────────────────────────────────────── + # ADDITIONAL INFORMATION + # ───────────────────────────────────────────────────────────────────────────── + - type: textarea + id: additional-context + attributes: + label: 📎 Additional Context + description: | + Add any other context, screenshots, mockups, or references about the feature request here. + + **Helpful additions:** + - Links to similar features in other software + - Mockups or diagrams + - Code examples + - Documentation references + placeholder: | + Any other relevant information, links, or screenshots... + + - type: textarea + id: acceptance-criteria + attributes: + label: ✅ Acceptance Criteria + description: | + (Optional) Define what "done" looks like for this feature. + + Format: **Given** [context], **When** [action], **Then** [outcome] + placeholder: | + Given a customer is selected from region X + When the sale is completed + Then the tax rate for region X is automatically applied + And the tax amount is correctly calculated + And a tax entry is logged in the report + + # ───────────────────────────────────────────────────────────────────────────── + # CONFIRMATION + # ───────────────────────────────────────────────────────────────────────────── + - type: checkboxes + id: terms + attributes: + label: ✓ Confirmation + description: Please confirm before submitting + options: + - label: I have searched existing feature requests to ensure this is not a duplicate + required: true + - label: I have provided a clear problem statement and proposed solution + required: true \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 000000000..5f27e9260 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,285 @@ +name: Release Version Bump + +on: + workflow_dispatch: + inputs: + version_type: + description: 'Version bump type' + required: true + type: choice + options: + - minor + - major + - patch + default: 'minor' + draft_only: + description: 'Create draft release only (do not push changes)' + required: true + type: boolean + default: false + +permissions: + contents: write + +jobs: + prepare-release: + name: Prepare Release + runs-on: ubuntu-22.04 + outputs: + new_version: ${{ steps.version.outputs.new_version }} + previous_version: ${{ steps.version.outputs.previous_version }} + + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GITHUB_TOKEN }} + + - name: Get current version + id: current_version + run: | + CURRENT_VERSION=$(grep "application_version" app/Config/App.php | sed "s/.*= '\(.*\)';/\1/g") + echo "current_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT + echo "Current version: $CURRENT_VERSION" + + - name: Calculate new version + id: version + run: | + CURRENT_VERSION="${{ steps.current_version.outputs.current_version }}" + VERSION_TYPE="${{ github.event.inputs.version_type }}" + + # Parse current version + MAJOR=$(echo $CURRENT_VERSION | cut -d. -f1) + MINOR=$(echo $CURRENT_VERSION | cut -d. -f2) + PATCH=$(echo $CURRENT_VERSION | cut -d. -f3) + + # Bump version based on type + case $VERSION_TYPE in + major) + MAJOR=$((MAJOR + 1)) + MINOR=0 + PATCH=0 + ;; + minor) + MINOR=$((MINOR + 1)) + PATCH=0 + ;; + patch) + PATCH=$((PATCH + 1)) + ;; + esac + + NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}" + echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT + echo "previous_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT + echo "New version: $NEW_VERSION (was: $CURRENT_VERSION, type: $VERSION_TYPE)" + + - name: Update version in App.php + run: | + NEW_VERSION="${{ steps.version.outputs.new_version }}" + sed -i "s/public string \\\$application_version = '[^']*';/public string \\\$application_version = '$NEW_VERSION';/" app/Config/App.php + echo "Updated app/Config/App.php" + + - name: Update version in package.json + run: | + NEW_VERSION="${{ steps.version.outputs.new_version }}" + sed -i "s/\"version\": \"[^\"]*\",/\"version\": \"$NEW_VERSION\",/" package.json + echo "Updated package.json" + + - name: Update version in docker-compose.nginx.yml + run: | + NEW_VERSION="${{ steps.version.outputs.new_version }}" + sed -i "s/jekkos\/opensourcepos:[^ ]*/jekkos\/opensourcepos:$NEW_VERSION/" docker-compose.nginx.yml + echo "Updated docker-compose.nginx.yml" + + - name: Update version in README.md + run: | + NEW_VERSION="${{ steps.version.outputs.new_version }}" + # Extract major.minor for the "latest X.Y version" text + MAJOR_MINOR=$(echo "$NEW_VERSION" | cut -d. -f1,2) + sed -i "s/The latest \`[0-9]*\.[0-9]*\` version/The latest \`${MAJOR_MINOR}\` version/" README.md + echo "Updated README.md with version ${MAJOR_MINOR}" + + - name: Update version in SECURITY.md + run: | + NEW_VERSION="${{ steps.version.outputs.new_version }}" + # Update the supported versions table + sed -i "s/| >= [0-9]*\.[0-9]*\.[0-9]* |/| >= ${NEW_VERSION} |/" SECURITY.md + sed -i "s/| < [0-9]*\.[0-9]*\.[0-9]* |/| < ${NEW_VERSION} |/" SECURITY.md + echo "Updated SECURITY.md with version ${NEW_VERSION}" + + - name: Update version in issue templates + run: | + NEW_VERSION="${{ steps.version.outputs.new_version }}" + + # Update bug report template + BUG_TEMPLATE=".github/ISSUE_TEMPLATE/bug report.yml" + # Insert new version after "development (unreleased)" option + sed -i "/- development (unreleased)/a\\ - opensourcepos ${NEW_VERSION}" "$BUG_TEMPLATE" + # Remove duplicate if already exists (keep only 5 recent versions) + sed -i '/opensourcepos 3\.3\.7/d' "$BUG_TEMPLATE" + echo "Updated $BUG_TEMPLATE" + + # Update feature request template + FEATURE_TEMPLATE=".github/ISSUE_TEMPLATE/feature_request.yml" + # Insert new version at the top of version options + sed -i "/options:/,/default:/{/opensourcepos/s/^/ - opensourcepos ${NEW_VERSION}\n/}" "$FEATURE_TEMPLATE" + # Cleanup: remove duplicate new version if already at top, and remove oldest + sed -i '/opensourcepos 3\.3\.8/d' "$FEATURE_TEMPLATE" + echo "Updated $FEATURE_TEMPLATE" + + - name: Generate changelog + id: changelog + run: | + PREVIOUS_VERSION="${{ steps.version.outputs.previous_version }}" + NEW_VERSION="${{ steps.version.outputs.new_version }}" + + # Get the previous tag + PREVIOUS_TAG="${PREVIOUS_VERSION}" + + # Get commits since last version + if git rev-parse "$PREVIOUS_TAG" >/dev/null 2>&1; then + COMMITS=$(git log "$PREVIOUS_TAG"..HEAD --pretty=format:"- %s" --no-merges) + else + COMMITS=$(git log --pretty=format:"- %s" --no-merges -50) + fi + + # Create changelog entry + CHANGELOG_FILE="CHANGELOG.md" + + # Create the new version comparison link + NEW_LINK="[${NEW_VERSION}]: https://github.com/opensourcepos/opensourcepos/compare/${PREVIOUS_VERSION}...${NEW_VERSION}" + + # Insert new link after [unreleased] line + sed -i "/^\[unreleased\]/a $NEW_LINK" "$CHANGELOG_FILE" + + # Create version header and content + VERSION_DATE=$(date +%Y-%m-%d) + VERSION_HEADER="## [$NEW_VERSION] - $VERSION_DATE" + + # Insert new version section after unreleased header + sed -i "/^## \[Unreleased\]/a \\\n$VERSION_HEADER\n\n$COMMITS" "$CHANGELOG_FILE" + + echo "Updated CHANGELOG.md" + echo "Changelog entries:" + echo "$COMMITS" + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: '8.2' + extensions: intl, mbstring, mysqli, gd, bcmath, zip + coverage: none + + - name: Setup Node.js + uses: actions/setup-node@v4 + with: + node-version: '20' + + - name: Get composer cache directory + run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV + + - name: Cache composer dependencies + uses: actions/cache@v4 + with: + path: ${{ env.COMPOSER_CACHE_FILES_DIR }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-composer- + + - name: Get npm cache directory + run: echo "NPM_CACHE_DIR=$(npm config get cache)" >> $GITHUB_ENV + + - name: Cache npm dependencies + uses: actions/cache@v4 + with: + path: ${{ env.NPM_CACHE_DIR }} + key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-node- + + - name: Install composer dependencies + run: composer install --no-dev --optimize-autoloader + + - name: Install npm dependencies + run: npm ci + + - name: Install gulp globally + run: npm install -g gulp-cli + + - name: Get version info for build + id: build_version + run: | + VERSION="${{ steps.version.outputs.new_version }}" + SHORT_SHA=$(git rev-parse --short=6 HEAD) + echo "version=$VERSION" >> $GITHUB_OUTPUT + echo "version-tag=$VERSION" >> $GITHUB_OUTPUT + echo "short-sha=$SHORT_SHA" >> $GITHUB_OUTPUT + + - name: Create .env file + run: | + cp .env.example .env + sed -i 's/production/development/g' .env + + - name: Update commit hash + run: | + SHORT_SHA="${{ steps.build_version.outputs.short-sha }}" + sed -i "s/commit_sha1 = 'dev'/commit_sha1 = '$SHORT_SHA'/g" app/Config/OSPOS.php + + - name: Build frontend assets + run: npm run build + + - name: Create distribution archives + run: | + set -euo pipefail + gulp compress + VERSION="${{ steps.build_version.outputs.version }}" + mv dist/opensourcepos.tar "dist/opensourcepos.$VERSION.tar" + mv dist/opensourcepos.zip "dist/opensourcepos.$VERSION.zip" + + - name: Upload build artifacts + uses: actions/upload-artifact@v4 + with: + name: dist-release-${{ steps.build_version.outputs.version }} + path: dist/ + retention-days: 7 + + - name: Commit version bump + if: github.event.inputs.draft_only != 'true' + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + + NEW_VERSION="${{ steps.version.outputs.new_version }}" + + git add app/Config/App.php package.json docker-compose.nginx.yml CHANGELOG.md README.md SECURITY.md .github/ISSUE_TEMPLATE/ + git commit -m "chore: release version $NEW_VERSION" + git push origin HEAD + + - name: Create release tag + if: github.event.inputs.draft_only != 'true' + run: | + NEW_VERSION="${{ steps.version.outputs.new_version }}" + git tag "$NEW_VERSION" + git push origin "$NEW_VERSION" + + - name: Create draft release + uses: softprops/action-gh-release@v2 + with: + tag_name: ${{ steps.version.outputs.new_version }} + name: OpenSourcePOS ${{ steps.version.outputs.new_version }} + body: | + ## OpenSourcePOS ${{ steps.version.outputs.new_version }} + + ### Changes + See [CHANGELOG.md](https://github.com/opensourcepos/opensourcepos/blob/master/CHANGELOG.md) for details. + + ### Downloads + - `opensourcepos.${{ steps.version.outputs.new_version }}.zip` - Full release package + files: | + dist/opensourcepos.${{ steps.version.outputs.new_version }}.zip + draft: true + prerelease: false + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/update-issue-templates.yml b/.github/workflows/update-issue-templates.yml deleted file mode 100644 index f101a6264..000000000 --- a/.github/workflows/update-issue-templates.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: Update Issue Templates - -on: - release: - types: [published] - workflow_dispatch: - schedule: - - cron: '0 0 * * 0' - -jobs: - update-templates: - runs-on: ubuntu-latest - permissions: - contents: write - - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Fetch releases and update templates - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - # Fetch releases from GitHub API - RELEASES=$(gh api repos/${{ github.repository }}/releases --jq '.[].tag_name' | head -n 10) - - # Create temporary file with options - OPTIONS_FILE=$(mktemp) - echo " - development (unreleased)" >> "$OPTIONS_FILE" - while IFS= read -r release; do - echo " - opensourcepos $release" >> "$OPTIONS_FILE" - done <<< "$RELEASES" - - update_template() { - local template="$1" - local template_path=".github/ISSUE_TEMPLATE/$template" - - # Find the line numbers for the OpensourcePOS Version dropdown - start_line=$(grep -n "label: OpensourcePOS Version" "$template_path" | cut -d: -f1) - - if [ -z "$start_line" ]; then - echo "Could not find OpensourcePOS Version in $template" - return 1 - fi - - # Find the options section and default line - options_start=$((start_line + 3)) - default_line=$(grep -n "default:" "$template_path" | awk -F: -v opts="$options_start" '$1 > opts {print $1; exit}') - - # Create new template file - head -n $((options_start - 1)) "$template_path" > "${template_path}.new" - cat "$OPTIONS_FILE" >> "${template_path}.new" - tail -n +$default_line "$template_path" >> "${template_path}.new" - mv "${template_path}.new" "$template_path" - - echo "Updated $template" - } - - update_template "bug report.yml" - update_template "feature_request.yml" - - - name: Commit and push changes - run: | - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - git add .github/ISSUE_TEMPLATE/*.yml - if git diff --staged --quiet; then - echo "No changes to commit" - else - git commit -m "Update issue templates with latest releases [skip ci]" - git push - fi \ No newline at end of file From 3038f83a4a1bea8e2c79e5862e3ceda6de9b42b7 Mon Sep 17 00:00:00 2001 From: Ollama Date: Mon, 6 Apr 2026 19:56:19 +0000 Subject: [PATCH 02/11] refactor: simplify release workflow to version bump only - Remove build steps (handled by build-release.yml on push) - Remove tag creation (create tag from unstable release later) - Remove draft release creation - Remove SECURITY.md and issue template updates - Keep version bumps in: App.php, package.json, docker-compose.nginx.yml, README.md, CHANGELOG.md Workflow now: 1. Bumps version in source files 2. Commits and pushes to master 3. build-release.yml picks up the push and creates unstable release --- .github/workflows/release.yml | 155 +--------------------------------- 1 file changed, 4 insertions(+), 151 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5f27e9260..fe6997434 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,11 +12,6 @@ on: - major - patch default: 'minor' - draft_only: - description: 'Create draft release only (do not push changes)' - required: true - type: boolean - default: false permissions: contents: write @@ -25,9 +20,6 @@ jobs: prepare-release: name: Prepare Release runs-on: ubuntu-22.04 - outputs: - new_version: ${{ steps.version.outputs.new_version }} - previous_version: ${{ steps.version.outputs.previous_version }} steps: - name: Checkout @@ -101,46 +93,15 @@ jobs: sed -i "s/The latest \`[0-9]*\.[0-9]*\` version/The latest \`${MAJOR_MINOR}\` version/" README.md echo "Updated README.md with version ${MAJOR_MINOR}" - - name: Update version in SECURITY.md - run: | - NEW_VERSION="${{ steps.version.outputs.new_version }}" - # Update the supported versions table - sed -i "s/| >= [0-9]*\.[0-9]*\.[0-9]* |/| >= ${NEW_VERSION} |/" SECURITY.md - sed -i "s/| < [0-9]*\.[0-9]*\.[0-9]* |/| < ${NEW_VERSION} |/" SECURITY.md - echo "Updated SECURITY.md with version ${NEW_VERSION}" - - - name: Update version in issue templates - run: | - NEW_VERSION="${{ steps.version.outputs.new_version }}" - - # Update bug report template - BUG_TEMPLATE=".github/ISSUE_TEMPLATE/bug report.yml" - # Insert new version after "development (unreleased)" option - sed -i "/- development (unreleased)/a\\ - opensourcepos ${NEW_VERSION}" "$BUG_TEMPLATE" - # Remove duplicate if already exists (keep only 5 recent versions) - sed -i '/opensourcepos 3\.3\.7/d' "$BUG_TEMPLATE" - echo "Updated $BUG_TEMPLATE" - - # Update feature request template - FEATURE_TEMPLATE=".github/ISSUE_TEMPLATE/feature_request.yml" - # Insert new version at the top of version options - sed -i "/options:/,/default:/{/opensourcepos/s/^/ - opensourcepos ${NEW_VERSION}\n/}" "$FEATURE_TEMPLATE" - # Cleanup: remove duplicate new version if already at top, and remove oldest - sed -i '/opensourcepos 3\.3\.8/d' "$FEATURE_TEMPLATE" - echo "Updated $FEATURE_TEMPLATE" - - name: Generate changelog id: changelog run: | PREVIOUS_VERSION="${{ steps.version.outputs.previous_version }}" NEW_VERSION="${{ steps.version.outputs.new_version }}" - # Get the previous tag - PREVIOUS_TAG="${PREVIOUS_VERSION}" - # Get commits since last version - if git rev-parse "$PREVIOUS_TAG" >/dev/null 2>&1; then - COMMITS=$(git log "$PREVIOUS_TAG"..HEAD --pretty=format:"- %s" --no-merges) + if git rev-parse "$PREVIOUS_VERSION" >/dev/null 2>&1; then + COMMITS=$(git log "$PREVIOUS_VERSION"..HEAD --pretty=format:"- %s" --no-merges) else COMMITS=$(git log --pretty=format:"- %s" --no-merges -50) fi @@ -165,121 +126,13 @@ jobs: echo "Changelog entries:" echo "$COMMITS" - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: '8.2' - extensions: intl, mbstring, mysqli, gd, bcmath, zip - coverage: none - - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: '20' - - - name: Get composer cache directory - run: echo "COMPOSER_CACHE_FILES_DIR=$(composer config cache-files-dir)" >> $GITHUB_ENV - - - name: Cache composer dependencies - uses: actions/cache@v4 - with: - path: ${{ env.COMPOSER_CACHE_FILES_DIR }} - key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-composer- - - - name: Get npm cache directory - run: echo "NPM_CACHE_DIR=$(npm config get cache)" >> $GITHUB_ENV - - - name: Cache npm dependencies - uses: actions/cache@v4 - with: - path: ${{ env.NPM_CACHE_DIR }} - key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }} - restore-keys: | - ${{ runner.os }}-node- - - - name: Install composer dependencies - run: composer install --no-dev --optimize-autoloader - - - name: Install npm dependencies - run: npm ci - - - name: Install gulp globally - run: npm install -g gulp-cli - - - name: Get version info for build - id: build_version - run: | - VERSION="${{ steps.version.outputs.new_version }}" - SHORT_SHA=$(git rev-parse --short=6 HEAD) - echo "version=$VERSION" >> $GITHUB_OUTPUT - echo "version-tag=$VERSION" >> $GITHUB_OUTPUT - echo "short-sha=$SHORT_SHA" >> $GITHUB_OUTPUT - - - name: Create .env file - run: | - cp .env.example .env - sed -i 's/production/development/g' .env - - - name: Update commit hash - run: | - SHORT_SHA="${{ steps.build_version.outputs.short-sha }}" - sed -i "s/commit_sha1 = 'dev'/commit_sha1 = '$SHORT_SHA'/g" app/Config/OSPOS.php - - - name: Build frontend assets - run: npm run build - - - name: Create distribution archives - run: | - set -euo pipefail - gulp compress - VERSION="${{ steps.build_version.outputs.version }}" - mv dist/opensourcepos.tar "dist/opensourcepos.$VERSION.tar" - mv dist/opensourcepos.zip "dist/opensourcepos.$VERSION.zip" - - - name: Upload build artifacts - uses: actions/upload-artifact@v4 - with: - name: dist-release-${{ steps.build_version.outputs.version }} - path: dist/ - retention-days: 7 - - name: Commit version bump - if: github.event.inputs.draft_only != 'true' run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" NEW_VERSION="${{ steps.version.outputs.new_version }}" - git add app/Config/App.php package.json docker-compose.nginx.yml CHANGELOG.md README.md SECURITY.md .github/ISSUE_TEMPLATE/ + git add app/Config/App.php package.json docker-compose.nginx.yml CHANGELOG.md README.md git commit -m "chore: release version $NEW_VERSION" - git push origin HEAD - - - name: Create release tag - if: github.event.inputs.draft_only != 'true' - run: | - NEW_VERSION="${{ steps.version.outputs.new_version }}" - git tag "$NEW_VERSION" - git push origin "$NEW_VERSION" - - - name: Create draft release - uses: softprops/action-gh-release@v2 - with: - tag_name: ${{ steps.version.outputs.new_version }} - name: OpenSourcePOS ${{ steps.version.outputs.new_version }} - body: | - ## OpenSourcePOS ${{ steps.version.outputs.new_version }} - - ### Changes - See [CHANGELOG.md](https://github.com/opensourcepos/opensourcepos/blob/master/CHANGELOG.md) for details. - - ### Downloads - - `opensourcepos.${{ steps.version.outputs.new_version }}.zip` - Full release package - files: | - dist/opensourcepos.${{ steps.version.outputs.new_version }}.zip - draft: true - prerelease: false - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + git push origin HEAD \ No newline at end of file From 0ac427b2b15fefcc0c51eb346dc5df5ec4b57936 Mon Sep 17 00:00:00 2001 From: Ollama Date: Wed, 8 Apr 2026 07:45:18 +0000 Subject: [PATCH 03/11] fix: address review comments - Update [unreleased] changelog link to start from new version - Remove misleading notes about automatic version updates from issue templates (release workflow no longer auto-updates template version lists) --- .github/ISSUE_TEMPLATE/bug report.yml | 5 ----- .github/ISSUE_TEMPLATE/feature_request.yml | 5 ----- .github/workflows/release.yml | 3 +++ 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug report.yml b/.github/ISSUE_TEMPLATE/bug report.yml index fa7239534..dec00a5e8 100644 --- a/.github/ISSUE_TEMPLATE/bug report.yml +++ b/.github/ISSUE_TEMPLATE/bug report.yml @@ -18,11 +18,6 @@ body: > ⚠️ **Important:** Submit a separate bug report for each problem you encounter. > > 🚫 Do not include personal identifying information such as email addresses or encryption keys. - - --- - - > 📝 **Note:** The version list is automatically updated when a new release is created. - > See [`.github/workflows/release.yml`](../.github/workflows/release.yml) for details. # ───────────────────────────────────────────────────────────────────────────── # PROBLEM DESCRIPTION diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index c5100bf40..3df9b880f 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -15,11 +15,6 @@ body: We appreciate you taking the time to help improve OpenSourcePOS. > 📋 **Before submitting:** Please search [existing feature requests](https://github.com/opensourcepos/opensourcepos/issues?q=is%3Aissue+is%3Aopen+label%3Aenhancement) to ensure your idea hasn't already been suggested. - - --- - - > 📝 **Note:** The version list is automatically updated when a new release is created. - > See [`.github/workflows/release.yml`](../.github/workflows/release.yml) for details. # ───────────────────────────────────────────────────────────────────────────── # FEATURE DETAILS diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe6997434..8cbe76591 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -115,6 +115,9 @@ jobs: # Insert new link after [unreleased] line sed -i "/^\[unreleased\]/a $NEW_LINK" "$CHANGELOG_FILE" + # Update [unreleased] link to start from new version + sed -i "s|^\[unreleased\]: .*|\[unreleased\]: https://github.com/opensourcepos/opensourcepos/compare/${NEW_VERSION}...HEAD|" "$CHANGELOG_FILE" + # Create version header and content VERSION_DATE=$(date +%Y-%m-%d) VERSION_HEADER="## [$NEW_VERSION] - $VERSION_DATE" From e17944d883068a3af33f0ee32b9c941faafa6acf Mon Sep 17 00:00:00 2001 From: Ollama Date: Wed, 8 Apr 2026 10:11:45 +0000 Subject: [PATCH 04/11] fix: address all review comments and restore issue template version update - Add issue template version update back with correct 'OpenSourcePOS' casing - Fix version list inconsistency (add 3.3.8 to feature_request.yml, align with bug report.yml) - Fix changelog special characters issue by using temp file instead of inline sed - Keep versions in sync between both templates --- .github/ISSUE_TEMPLATE/feature_request.yml | 3 +- .github/workflows/release.yml | 39 +++++++++++++++++++--- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 3df9b880f..16714eb90 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -42,11 +42,12 @@ body: label: 📦 OpenSourcePOS Version description: What version are you currently running? options: + - development (unreleased) - OpenSourcePOS 3.4.2 - OpenSourcePOS 3.4.1 - OpenSourcePOS 3.4.0 - OpenSourcePOS 3.3.9 - - development (unreleased) + - OpenSourcePOS 3.3.8 default: 0 validations: required: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8cbe76591..de5582582 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -118,17 +118,48 @@ jobs: # Update [unreleased] link to start from new version sed -i "s|^\[unreleased\]: .*|\[unreleased\]: https://github.com/opensourcepos/opensourcepos/compare/${NEW_VERSION}...HEAD|" "$CHANGELOG_FILE" - # Create version header and content + # Create version header and content using temp file to avoid sed issues with special characters VERSION_DATE=$(date +%Y-%m-%d) VERSION_HEADER="## [$NEW_VERSION] - $VERSION_DATE" - # Insert new version section after unreleased header - sed -i "/^## \[Unreleased\]/a \\\n$VERSION_HEADER\n\n$COMMITS" "$CHANGELOG_FILE" + # Create temp file with changelog entry + TMP_FILE=$(mktemp) + { + echo "" + echo "$VERSION_HEADER" + echo "" + echo "$COMMITS" + } > "$TMP_FILE" + + # Insert after Unreleased header + sed -i "/^## \[Unreleased\]/r $TMP_FILE" "$CHANGELOG_FILE" + rm "$TMP_FILE" echo "Updated CHANGELOG.md" echo "Changelog entries:" echo "$COMMITS" + - name: Update version in issue templates + run: | + NEW_VERSION="${{ steps.version.outputs.new_version }}" + + # Calculate version to remove (keep 5 versions) + PREVIOUS_VERSION="${{ steps.version.outputs.previous_version }}" + + # Bug report template - insert new version after development (unreleased) + BUG_TEMPLATE=".github/ISSUE_TEMPLATE/bug report.yml" + sed -i "/- development (unreleased)/a\\ - OpenSourcePOS ${NEW_VERSION}" "$BUG_TEMPLATE" + # Remove the oldest version (5th version from the end) + sed -i "/OpenSourcePOS 3\\.3\\.7/d" "$BUG_TEMPLATE" + echo "Updated $BUG_TEMPLATE" + + # Feature request template - insert new version after development (unreleased) + FEATURE_TEMPLATE=".github/ISSUE_TEMPLATE/feature_request.yml" + sed -i "/- development (unreleased)/a\\ - OpenSourcePOS ${NEW_VERSION}" "$FEATURE_TEMPLATE" + # Remove the oldest version (5th version from the end) + sed -i "/OpenSourcePOS 3\\.3\\.7/d" "$FEATURE_TEMPLATE" + echo "Updated $FEATURE_TEMPLATE" + - name: Commit version bump run: | git config user.name "github-actions[bot]" @@ -136,6 +167,6 @@ jobs: NEW_VERSION="${{ steps.version.outputs.new_version }}" - git add app/Config/App.php package.json docker-compose.nginx.yml CHANGELOG.md README.md + git add app/Config/App.php package.json docker-compose.nginx.yml CHANGELOG.md README.md .github/ISSUE_TEMPLATE/ git commit -m "chore: release version $NEW_VERSION" git push origin HEAD \ No newline at end of file From 71056d9b03be2b9749b843403f79ed90a82666ce Mon Sep 17 00:00:00 2001 From: jekkos Date: Wed, 8 Apr 2026 13:34:37 +0000 Subject: [PATCH 05/11] fix: Tax Rate form not loading due to router service failure (#4479) The get_tax_rates_data_row() function in tax_helper.php was calling service('router') without handling cases where the router service is unavailable, causing the form modal to fail to open. This fix adds a fallback to 'taxes' controller name when router service returns null or fails. Also adds missing 'id' field in postSave() JSON response for proper row highlighting after save operations. Fixes #4477 Co-authored-by: Ollama Co-authored-by: odiea --- app/Helpers/tax_helper.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Helpers/tax_helper.php b/app/Helpers/tax_helper.php index 9e5008e38..d288d7beb 100644 --- a/app/Helpers/tax_helper.php +++ b/app/Helpers/tax_helper.php @@ -143,8 +143,7 @@ function get_tax_rates_manage_table_headers(): string */ function get_tax_rates_data_row($tax_rates_row): array { - $router = service('router'); - $controller_name = strtolower($router->controllerName()); + $controller_name = 'taxes'; return [ 'tax_rate_id' => $tax_rates_row->tax_rate_id, From 7f9321eca08c50276577cc0cc167ede4d0bf5429 Mon Sep 17 00:00:00 2001 From: jekkos Date: Wed, 8 Apr 2026 20:19:25 +0000 Subject: [PATCH 06/11] fix: Handle empty database on fresh install (#4467) * fix: Handle empty database on fresh install * feat: Add migration progress bar with jQuery AJAX - Session.php: Switch to file-based sessions when migrations table doesn't exist - OSPOS.php: Catch DatabaseException when config table missing, set defaults - MY_Migration.php: Handle database connection failures gracefully - Load_config.php: Set default language settings when config empty --------- Co-authored-by: Ollama --- Dockerfile.test | 3 - app/Config/Filters.php | 2 +- app/Config/OSPOS.php | 21 ++- app/Config/Routes.php | 1 + app/Config/Session.php | 21 +++ app/Controllers/Home.php | 7 +- app/Controllers/Login.php | 26 ++++ app/Events/Load_config.php | 56 +++---- app/Helpers/locale_helper.php | 8 +- app/Helpers/security_helper.php | 100 ++++++------ app/Language/ar-EG/Login.php | 9 ++ app/Language/ar-LB/Login.php | 9 ++ app/Language/az/Login.php | 9 ++ app/Language/bg/Login.php | 9 ++ app/Language/bs/Login.php | 9 ++ app/Language/ckb/Login.php | 9 ++ app/Language/cs/Login.php | 9 ++ app/Language/da/Login.php | 9 ++ app/Language/de-CH/Login.php | 17 ++- app/Language/de-DE/Login.php | 17 ++- app/Language/el/Login.php | 9 ++ app/Language/en-GB/Login.php | 9 ++ app/Language/en/Login.php | 6 + app/Language/es-ES/Login.php | 9 ++ app/Language/es-MX/Login.php | 9 ++ app/Language/fa/Login.php | 9 ++ app/Language/fr/Login.php | 9 ++ app/Language/he/Login.php | 9 ++ app/Language/hr-HR/Login.php | 9 ++ app/Language/hu/Login.php | 9 ++ app/Language/hy/Login.php | 9 ++ app/Language/id/Login.php | 9 ++ app/Language/it/Login.php | 11 +- app/Language/km/Login.php | 9 ++ app/Language/lo/Login.php | 9 ++ app/Language/ml/Login.php | 9 ++ app/Language/nb/Login.php | 9 ++ app/Language/nl-BE/Login.php | 9 ++ app/Language/nl-NL/Login.php | 9 ++ app/Language/pl/Login.php | 9 ++ app/Language/pt-BR/Login.php | 11 +- app/Language/ro/Login.php | 9 ++ app/Language/ru/Login.php | 9 ++ app/Language/sv/Login.php | 9 ++ app/Language/sw-KE/Login.php | 9 ++ app/Language/sw-TZ/Login.php | 9 ++ app/Language/ta/Login.php | 9 ++ app/Language/th/Login.php | 9 ++ app/Language/tl/Login.php | 9 ++ app/Language/tr/Login.php | 11 +- app/Language/uk/Login.php | 9 ++ app/Language/ur/Login.php | 9 ++ app/Language/vi/Login.php | 9 ++ app/Language/zh-Hans/Login.php | 9 ++ app/Language/zh-Hant/Login.php | 9 ++ app/Libraries/MY_Migration.php | 30 ++-- app/Views/login.php | 259 ++++++++++++++++++++++++++------ gulpfile.js | 18 +++ public/resources/.gitkeep | 0 59 files changed, 800 insertions(+), 176 deletions(-) delete mode 100644 Dockerfile.test create mode 100644 public/resources/.gitkeep diff --git a/Dockerfile.test b/Dockerfile.test deleted file mode 100644 index 3729f6ac9..000000000 --- a/Dockerfile.test +++ /dev/null @@ -1,3 +0,0 @@ -FROM php:8.4-cli -RUN apt-get update && apt-get install -y libicu-dev && docker-php-ext-install intl -WORKDIR /app \ No newline at end of file diff --git a/app/Config/Filters.php b/app/Config/Filters.php index efb99dfd8..d8c097059 100644 --- a/app/Config/Filters.php +++ b/app/Config/Filters.php @@ -70,7 +70,7 @@ class Filters extends BaseFilters public array $globals = [ 'before' => [ 'honeypot', - 'csrf' => ['except' => 'login'], + 'csrf' => ['except' => 'login|migrate'], 'invalidchars', ], 'after' => [ diff --git a/app/Config/OSPOS.php b/app/Config/OSPOS.php index 6d4efbb22..d8b5b99d4 100644 --- a/app/Config/OSPOS.php +++ b/app/Config/OSPOS.php @@ -5,6 +5,7 @@ namespace Config; use App\Models\Appconfig; use CodeIgniter\Cache\CacheInterface; use CodeIgniter\Config\BaseConfig; +use CodeIgniter\Database\Exceptions\DatabaseException; /** * This class holds the configuration options stored from the database so that on launch those settings can be cached @@ -34,11 +35,21 @@ class OSPOS extends BaseConfig if ($cache) { $this->settings = decode_array($cache); } else { - $appconfig = model(Appconfig::class); - foreach ($appconfig->get_all()->getResult() as $app_config) { - $this->settings[$app_config->key] = $app_config->value; + try { + $appconfig = model(Appconfig::class); + foreach ($appconfig->get_all()->getResult() as $app_config) { + $this->settings[$app_config->key] = $app_config->value; + } + $this->cache->save('settings', encode_array($this->settings)); + } catch (DatabaseException $e) { + // Database table doesn't exist yet (migrations haven't run) + // Return empty settings to allow migration page to display + $this->settings = [ + 'language' => 'english', + 'language_code' => 'en', + 'company' => 'Home' + ]; } - $this->cache->save('settings', encode_array($this->settings)); } } @@ -50,4 +61,4 @@ class OSPOS extends BaseConfig $this->cache->delete('settings'); $this->set_settings(); } -} +} \ No newline at end of file diff --git a/app/Config/Routes.php b/app/Config/Routes.php index b4fbf3221..b1cc0a484 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -10,6 +10,7 @@ $routes->setDefaultController('Login'); $routes->get('/', 'Login::index'); $routes->get('login', 'Login::index'); $routes->post('login', 'Login::index'); +$routes->post('migrate', 'Login::migrate'); $routes->add('no_access/index/(:segment)', 'No_access::index/$1'); $routes->add('no_access/index/(:segment)/(:segment)', 'No_access::index/$1/$2'); diff --git a/app/Config/Session.php b/app/Config/Session.php index 662422a20..d749b2ff3 100644 --- a/app/Config/Session.php +++ b/app/Config/Session.php @@ -5,6 +5,8 @@ namespace Config; use CodeIgniter\Config\BaseConfig; use CodeIgniter\Session\Handlers\BaseHandler; use CodeIgniter\Session\Handlers\DatabaseHandler; +use CodeIgniter\Session\Handlers\FileHandler; +use Config\Database; class Session extends BaseConfig { @@ -124,4 +126,23 @@ class Session extends BaseConfig * seconds. */ public int $lockMaxRetries = 300; + + public function __construct() + { + parent::__construct(); + + if ($this->driver === DatabaseHandler::class) { + try { + $db = Database::connect(); + + if (!$db->tableExists($this->savePath)) { + $this->driver = FileHandler::class; + $this->savePath = WRITEPATH . 'session'; + } + } catch (\CodeIgniter\Database\Exceptions\DatabaseException $e) { + $this->driver = FileHandler::class; + $this->savePath = WRITEPATH . 'session'; + } + } + } } diff --git a/app/Controllers/Home.php b/app/Controllers/Home.php index 97d270ffd..50793597a 100644 --- a/app/Controllers/Home.php +++ b/app/Controllers/Home.php @@ -2,6 +2,7 @@ namespace App\Controllers; +use App\Libraries\MY_Migration; use CodeIgniter\HTTP\RedirectResponse; use CodeIgniter\HTTP\ResponseInterface; @@ -81,7 +82,7 @@ class Home extends Secure_Controller if ($this->employee->check_password($this->request->getPost('username', FILTER_SANITIZE_FULL_SPECIAL_CHARS), $this->request->getPost('current_password'))) { // Validate password length BEFORE hashing $new_password = $this->request->getPost('password'); - + if (strlen($new_password) < 8) { return $this->response->setJSON([ 'success' => false, @@ -89,7 +90,7 @@ class Home extends Secure_Controller 'id' => NEW_ENTRY ]); } - + $employee_data = [ 'username' => $this->request->getPost('username', FILTER_SANITIZE_FULL_SPECIAL_CHARS), 'password' => password_hash($new_password, PASSWORD_DEFAULT), @@ -124,4 +125,4 @@ class Home extends Secure_Controller ]); } } -} \ No newline at end of file +} diff --git a/app/Controllers/Login.php b/app/Controllers/Login.php index 48f723144..ee56e7c0b 100644 --- a/app/Controllers/Login.php +++ b/app/Controllers/Login.php @@ -5,6 +5,7 @@ namespace App\Controllers; use App\Libraries\MY_Migration; use App\Models\Employee; use CodeIgniter\HTTP\RedirectResponse; +use CodeIgniter\HTTP\ResponseInterface; use CodeIgniter\Model; use Config\OSPOS; use Config\Services; @@ -36,6 +37,7 @@ class Login extends BaseController $data = [ 'has_errors' => false, + 'is_new_install' => !(MY_Migration::get_current_version()), 'is_latest' => $migration->is_latest(), 'latest_version' => $migration->get_latest_migration(), 'gcaptcha_enabled' => $gcaptcha_enabled, @@ -71,4 +73,28 @@ class Login extends BaseController return redirect()->to('home'); } + + public function migrate(): ResponseInterface + { + try { + $migration = new MY_Migration(config('Migrations')); + $migration->migrate_to_ci4(); + + set_time_limit(3600); + $migration->setNamespace('App')->latest(); + + return $this->response->setJSON([ + 'success' => true, + 'message' => 'Migration completed successfully' + ]); + + } catch (\Exception $e) { + log_message('error', 'Migration failed: ' . $e->getMessage()); + + return $this->response->setJSON([ + 'success' => false, + 'message' => 'Migration failed: ' . $e->getMessage() + ])->setStatusCode(500); + } + } } diff --git a/app/Events/Load_config.php b/app/Events/Load_config.php index c08bfa857..39dce62c4 100644 --- a/app/Events/Load_config.php +++ b/app/Events/Load_config.php @@ -21,63 +21,47 @@ class Load_config { public Session $session; - /** - * Loads configuration from database into App CI config and then applies those settings - */ public function load_config(): void { - // Migrations $migration_config = config('Migrations'); $migration = new MY_Migration($migration_config); - // Use file-based session until database is migrated - $this->session = $this->createSession($migration->is_latest()); + $this->session = session(); - // Database Configuration $config = config(OSPOS::class); if (!$migration->is_latest()) { $this->session->destroy(); } - // Language - $language_exists = file_exists('../app/Language/' . current_language_code()); - - if (current_language_code() == null || current_language() == null || !$language_exists) { // TODO: current_language() is undefined - $config->settings['language'] = 'english'; - $config->settings['language_code'] = 'en'; - } + $this->setDefaultLanguage($config); $language = Services::language(); - $language->setLocale($config->settings['language_code']); + $language->setLocale(current_language_code()); - // Time Zone date_default_timezone_set($config->settings['timezone'] ?? ini_get('date.timezone')); bcscale(max(2, totals_decimals() + tax_decimals())); } - /** - * Creates session with appropriate handler. - * Uses file-based session until database is migrated, then switches to database session. - * - * This prevents a circular dependency where login requires session, but the sessions - * database table doesn't exist yet because migrations run after login. - */ - private function createSession(bool $isDbMigrated): Session + private function setDefaultLanguage(OSPOS $config): void { - $sessionConfig = config('Session'); - - // If database is not migrated and we're configured to use database sessions, - // temporarily fall back to file-based sessions to allow migrations to complete. - // Once migrations run, the user must re-authenticate (session is destroyed in - // load_config() when migrations are pending). - if (!$isDbMigrated && $sessionConfig->driver === DatabaseHandler::class) { - $sessionConfig = clone $sessionConfig; - $sessionConfig->driver = FileHandler::class; - $sessionConfig->savePath = WRITEPATH . 'session'; + $languageCode = $config->settings['language_code'] ?? null; + + if (empty($config->settings) || $languageCode === null) { + $config->settings['language'] = 'english'; + $config->settings['language_code'] = 'en'; + return; } - - return Services::session($sessionConfig); + + if (!$this->languageExists($languageCode)) { + $config->settings['language'] = 'english'; + $config->settings['language_code'] = 'en'; + } + } + + private function languageExists(string $languageCode): bool + { + return file_exists(APPPATH . 'Language/' . $languageCode); } } diff --git a/app/Helpers/locale_helper.php b/app/Helpers/locale_helper.php index b5d04e460..ed21c9fa9 100644 --- a/app/Helpers/locale_helper.php +++ b/app/Helpers/locale_helper.php @@ -22,9 +22,7 @@ function current_language_code(bool $load_system_language = false): string } } - $language_code = $config['language_code']; - - return empty($language_code) ? DEFAULT_LANGUAGE_CODE : $language_code; + return $config->language_code ?? DEFAULT_LANGUAGE_CODE; } /** @@ -45,9 +43,7 @@ function current_language(bool $load_system_language = false): string } } - $language = $config['language']; - - return empty($language) ? DEFAULT_LANGUAGE : $language; + return $config->language ?? DEFAULT_LANGUAGE_CODE; } /** diff --git a/app/Helpers/security_helper.php b/app/Helpers/security_helper.php index cc13796f8..927980e66 100644 --- a/app/Helpers/security_helper.php +++ b/app/Helpers/security_helper.php @@ -11,56 +11,54 @@ function check_encryption(): bool $old_key = config('Encryption')->key; if ((empty($old_key)) || (strlen($old_key) < 64)) { - // Create Key $encryption = new Encryption(); $key = bin2hex($encryption->createKey()); config('Encryption')->key = $key; - // Write to .env $config_path = ROOTPATH . '.env'; - $new_config_path = WRITEPATH . '/backup/.env'; $backup_path = WRITEPATH . '/backup/.env.bak'; - $backup_folder = WRITEPATH . '/backup'; - if (!file_exists($backup_folder) && !mkdir($backup_folder)) { - log_message('error', 'Could not create backup folder'); - return false; + if (!file_exists($backup_folder)) { + @mkdir($backup_folder, 0750, true); } - if (!copy($config_path, $backup_path)) { - log_message('error', "Unable to copy $config_path to $backup_path"); + if (!file_exists($config_path)) { + $example_path = ROOTPATH . '.env.example'; + if (file_exists($example_path)) { + @copy($example_path, $config_path); + } else { + @file_put_contents($config_path, "# OSPOS Configuration\n\n"); + } + @chmod($config_path, 0640); } - // Copy to backup - @chmod($config_path, 0660); - @chmod($backup_path, 0660); + if (file_exists($config_path)) { + @copy($config_path, $backup_path); + @chmod($backup_path, 0640); + @chmod($config_path, 0640); - $config_file = file_get_contents($config_path); - $config_file = preg_replace("/(encryption\.key.*=.*)('.*')/", "$1'$key'", $config_file); + $config_file = file_get_contents($config_path); - if (!empty($old_key)) { - $old_line = "# encryption.key = '$old_key' REMOVE IF UNNEEDED\r\n"; - $insertion_point = stripos($config_file, 'encryption.key'); - $config_file = substr_replace($config_file, $old_line, $insertion_point, 0); + if (strpos($config_file, 'encryption.key') !== false) { + $config_file = preg_replace("/(encryption\.key.*=.*)('.*')/", "$1'$key'", $config_file); + } else { + $config_file .= "\nencryption.key = '$key'\n"; + } + + if (!empty($old_key)) { + $old_line = "# encryption.key = '$old_key' REMOVE IF UNNEEDED\r\n"; + $insertion_point = stripos($config_file, 'encryption.key'); + if ($insertion_point !== false) { + $config_file = substr_replace($config_file, $old_line, $insertion_point, 0); + } + } + + @file_put_contents($config_path, $config_file); + @chmod($config_path, 0640); + + log_message('info', "Updated encryption key in $config_path"); } - - $handle = @fopen($config_path, 'w+'); - - if (empty($handle)) { - log_message('error', "Unable to open $config_path for updating"); - return false; - } - - @chmod($config_path, 0660); - $write_failed = !fwrite($handle, $config_file); - fclose($handle); - - if ($write_failed) { - log_message('error', "Unable to write to $config_path for updating."); - return false; - } - log_message('info', "File $config_path has been updated."); } return true; @@ -74,23 +72,14 @@ function abort_encryption_conversion(): void $config_path = ROOTPATH . '.env'; $backup_path = WRITEPATH . '/backup/.env.bak'; - $config_file = file_get_contents($backup_path); - - $handle = @fopen($config_path, 'w+'); - - if (empty($handle)) { - log_message('error', "Unable to open $config_path to undo encryption conversion"); - } else { - @chmod($config_path, 0660); - $write_failed = !fwrite($handle, $config_file); - fclose($handle); - - if ($write_failed) { - log_message('error', "Unable to write to $config_path to undo encryption conversion."); - return; - } - log_message('info', "File $config_path has been updated to undo encryption conversion"); + if (!file_exists($backup_path)) { + return; } + + @chmod($config_path, 0640); + $config_file = file_get_contents($backup_path); + @file_put_contents($config_path, $config_file); + log_message('info', "Restored $config_path from backup"); } /** @@ -99,13 +88,10 @@ function abort_encryption_conversion(): void function remove_backup(): void { $backup_path = WRITEPATH . '/backup/.env.bak'; - if (! file_exists($backup_path)) { + if (!file_exists($backup_path)) { return; } - if (!unlink($backup_path)) { - log_message('error', "Unable to remove $backup_path."); - return; - } - log_message('info', "File $backup_path has been removed"); + @unlink($backup_path); + log_message('info', "Removed $backup_path"); } diff --git a/app/Language/ar-EG/Login.php b/app/Language/ar-EG/Login.php index 9ca33871f..88a0c849d 100644 --- a/app/Language/ar-EG/Login.php +++ b/app/Language/ar-EG/Login.php @@ -9,6 +9,15 @@ return [ "login" => "دخول", "logout" => "تسجيل خروج", "migration_needed" => "سيبدأ ترحيل قاعدة البيانات إلى{0} بعد تسجيل الدخول.", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "كلمة السر", "required_username" => "", "username" => "اسم المستخدم", diff --git a/app/Language/ar-LB/Login.php b/app/Language/ar-LB/Login.php index f98db7855..9bccf4d73 100644 --- a/app/Language/ar-LB/Login.php +++ b/app/Language/ar-LB/Login.php @@ -9,6 +9,15 @@ return [ "login" => "دخول", "logout" => "تسجيل خروج", "migration_needed" => "سيبدأ ترحيل قاعدة البيانات إلى{0} بعد تسجيل الدخول.", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "كلمة السر", "required_username" => "خانة أسم المستخدم مطلوبة.", "username" => "اسم المستخدم", diff --git a/app/Language/az/Login.php b/app/Language/az/Login.php index 0f43adac9..7f5913520 100644 --- a/app/Language/az/Login.php +++ b/app/Language/az/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Giriş", "logout" => "Çıxış", "migration_needed" => "{0} -ə daxil olandan sonra verilənlər bazası miqrasiyası başlayacaq.", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Şifrə", "required_username" => "", "username" => "İstifadəçi", diff --git a/app/Language/bg/Login.php b/app/Language/bg/Login.php index 7c1d4ee26..29d7dfea3 100644 --- a/app/Language/bg/Login.php +++ b/app/Language/bg/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Login", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Password", "required_username" => "", "username" => "Username", diff --git a/app/Language/bs/Login.php b/app/Language/bs/Login.php index 467964cce..f65ae5809 100644 --- a/app/Language/bs/Login.php +++ b/app/Language/bs/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Prijava", "logout" => "Odjava", "migration_needed" => "Migracija baze podataka na {0} će početi nakon prijavljivanja.", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Lozinka", "required_username" => "", "username" => "Korisničko ime", diff --git a/app/Language/ckb/Login.php b/app/Language/ckb/Login.php index 985c9351c..9141fecfd 100644 --- a/app/Language/ckb/Login.php +++ b/app/Language/ckb/Login.php @@ -9,6 +9,15 @@ return [ 'login' => "چوونەژوورەوە", 'logout' => "چوونەدەرەوە", 'migration_needed' => "گواستنەوەی داتابەیس بۆ {0} دوای چوونەژوورەوە دەست پێدەکات.", + 'migration_required' => "", + 'migration_auth_message' => "", + 'migration_initializing' => "", + 'migration_running' => "", + 'migration_complete' => "", + 'migration_complete_login' => "", + 'migration_failed' => "", + 'migration_error_connection' => "", + 'migration_complete_redirect' => "", 'password' => "وشەی نهێنی", 'required_username' => "خانەی ناوی بەکارهێنەر پێویستە.", 'username' => "ناوی بەکارهێنەر", diff --git a/app/Language/cs/Login.php b/app/Language/cs/Login.php index 0ecd8cdfa..308401be6 100644 --- a/app/Language/cs/Login.php +++ b/app/Language/cs/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Login", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Heslo", "required_username" => "", "username" => "Uživatelské jméno", diff --git a/app/Language/da/Login.php b/app/Language/da/Login.php index d443ab5b5..652c3f22c 100644 --- a/app/Language/da/Login.php +++ b/app/Language/da/Login.php @@ -9,6 +9,15 @@ return [ "login" => "", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "", "required_username" => "", "username" => "", diff --git a/app/Language/de-CH/Login.php b/app/Language/de-CH/Login.php index 78c7e5c58..15b565a62 100644 --- a/app/Language/de-CH/Login.php +++ b/app/Language/de-CH/Login.php @@ -7,10 +7,19 @@ return [ "invalid_installation" => "", "invalid_username_and_password" => "Ungültiger Benutzername/Passwort", "login" => "Login", - "logout" => "", - "migration_needed" => "", + "logout" => "Abmelden", + "migration_needed" => "Eine Datenbank-Migration auf {0} wird nach der Anmeldung gestartet.", + "migration_required" => "Datenbank-Migration erforderlich", + "migration_auth_message" => "Administrator-Anmeldedaten sind erforderlich, um die Datenbank-Migration auf Version {0} zu autorisieren. Bitte melden Sie sich an, um fortzufahren.", + "migration_initializing" => "Datenbank wird initialisiert", + "migration_running" => "Datenbank-Migrationen werden ausgeführt...", + "migration_complete" => "Datenbank erfolgreich initialisiert!", + "migration_complete_login" => "Sie können sich jetzt anmelden.", + "migration_failed" => "Migration fehlgeschlagen", + "migration_error_connection" => "Verbindungsfehler. Bitte versuchen Sie es erneut.", + "migration_complete_redirect" => "Migration abgeschlossen. Weiterleitung zur Anmeldung...", "password" => "Passwort", - "required_username" => "", + "required_username" => "Das Feld Benutzername ist erforderlich.", "username" => "Benutzername", - "welcome" => "", + "welcome" => "Willkommen bei {0}!", ]; diff --git a/app/Language/de-DE/Login.php b/app/Language/de-DE/Login.php index 6b6bd14a7..723ab9a60 100644 --- a/app/Language/de-DE/Login.php +++ b/app/Language/de-DE/Login.php @@ -7,10 +7,19 @@ return [ "invalid_installation" => "Die Installation ist nicht korrekt, überprüfen Sie Ihre php.ini-Datei.", "invalid_username_and_password" => "Ungültiger Benutzername oder Passwort.", "login" => "Login", - "logout" => "", - "migration_needed" => "", + "logout" => "Abmelden", + "migration_needed" => "Eine Datenbank-Migration auf {0} wird nach der Anmeldung gestartet.", + "migration_required" => "Datenbank-Migration erforderlich", + "migration_auth_message" => "Administrator-Anmeldedaten sind erforderlich, um die Datenbank-Migration auf Version {0} zu autorisieren. Bitte melden Sie sich an, um fortzufahren.", + "migration_initializing" => "Datenbank wird initialisiert", + "migration_running" => "Datenbank-Migrationen werden ausgeführt...", + "migration_complete" => "Datenbank erfolgreich initialisiert!", + "migration_complete_login" => "Sie können sich jetzt anmelden.", + "migration_failed" => "Migration fehlgeschlagen", + "migration_error_connection" => "Verbindungsfehler. Bitte versuchen Sie es erneut.", + "migration_complete_redirect" => "Migration abgeschlossen. Weiterleitung zur Anmeldung...", "password" => "Passwort", - "required_username" => "", + "required_username" => "Das Feld Benutzername ist erforderlich.", "username" => "Benutzername", - "welcome" => "", + "welcome" => "Willkommen bei {0}!", ]; diff --git a/app/Language/el/Login.php b/app/Language/el/Login.php index d443ab5b5..652c3f22c 100644 --- a/app/Language/el/Login.php +++ b/app/Language/el/Login.php @@ -9,6 +9,15 @@ return [ "login" => "", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "", "required_username" => "", "username" => "", diff --git a/app/Language/en-GB/Login.php b/app/Language/en-GB/Login.php index 0eb94004e..928806a44 100644 --- a/app/Language/en-GB/Login.php +++ b/app/Language/en-GB/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Login", "logout" => "Logout", "migration_needed" => "A database migration to {0} will start after login.", + "migration_required" => "Database Migration Required", + "migration_auth_message" => "Administrator credentials are required to authorize the database migration to version {0}. Please login to proceed.", + "migration_initializing" => "Initializing Database", + "migration_running" => "Running database migrations...", + "migration_complete" => "Database initialized successfully!", + "migration_complete_login" => "You can now log in.", + "migration_failed" => "Migration failed", + "migration_error_connection" => "Connection error. Please try again.", + "migration_complete_redirect" => "Migration complete. Redirecting to login...", "password" => "Password", "required_username" => "The username field is required.", "username" => "Username", diff --git a/app/Language/en/Login.php b/app/Language/en/Login.php index 000360dea..928806a44 100644 --- a/app/Language/en/Login.php +++ b/app/Language/en/Login.php @@ -11,6 +11,12 @@ return [ "migration_needed" => "A database migration to {0} will start after login.", "migration_required" => "Database Migration Required", "migration_auth_message" => "Administrator credentials are required to authorize the database migration to version {0}. Please login to proceed.", + "migration_initializing" => "Initializing Database", + "migration_running" => "Running database migrations...", + "migration_complete" => "Database initialized successfully!", + "migration_complete_login" => "You can now log in.", + "migration_failed" => "Migration failed", + "migration_error_connection" => "Connection error. Please try again.", "migration_complete_redirect" => "Migration complete. Redirecting to login...", "password" => "Password", "required_username" => "The username field is required.", diff --git a/app/Language/es-ES/Login.php b/app/Language/es-ES/Login.php index 03868bd06..65f0b2287 100644 --- a/app/Language/es-ES/Login.php +++ b/app/Language/es-ES/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Iniciar Sesión", "logout" => "Cerrar sesión", "migration_needed" => "La migración de la base de datos a {0} se iniciará después del inicio de sesión.", + "migration_required" => "Migración de base de datos requerida", + "migration_auth_message" => "Se requieren credenciales de administrador para autorizar la migración de la base de datos a la versión {0}. Inicie sesión para continuar.", + "migration_initializing" => "Inicializando base de datos", + "migration_running" => "Ejecutando migraciones de base de datos...", + "migration_complete" => "¡Base de datos inicializada correctamente!", + "migration_complete_login" => "Ahora puede iniciar sesión.", + "migration_failed" => "Migración fallida", + "migration_error_connection" => "Error de conexión. Por favor, inténtelo de nuevo.", + "migration_complete_redirect" => "Migración completada. Redirigiendo al inicio de sesión...", "password" => "Contraseña", "required_username" => "El campo de nombre de usuario es obligatorio.", "username" => "Usuario", diff --git a/app/Language/es-MX/Login.php b/app/Language/es-MX/Login.php index f76c33cb2..bdcac3a7d 100644 --- a/app/Language/es-MX/Login.php +++ b/app/Language/es-MX/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Login", "logout" => "Salir", "migration_needed" => "Una migración de base de datos a {0} empezara después de entrar.", + "migration_required" => "Migración de base de datos requerida", + "migration_auth_message" => "Se requieren credenciales de administrador para autorizar la migración de la base de datos a la versión {0}. Inicie sesión para continuar.", + "migration_initializing" => "Inicializando base de datos", + "migration_running" => "Ejecutando migraciones de base de datos...", + "migration_complete" => "¡Base de datos inicializada correctamente!", + "migration_complete_login" => "Ahora puede iniciar sesión.", + "migration_failed" => "Migración fallida", + "migration_error_connection" => "Error de conexión. Por favor, inténtelo de nuevo.", + "migration_complete_redirect" => "Migración completada. Redirigiendo al inicio de sesión...", "password" => "Contraseña", "required_username" => "El nombre de usuario es obligatorio.", "username" => "Usuario", diff --git a/app/Language/fa/Login.php b/app/Language/fa/Login.php index 512f64b0e..4513d74f2 100644 --- a/app/Language/fa/Login.php +++ b/app/Language/fa/Login.php @@ -9,6 +9,15 @@ return [ "login" => "وارد شدن", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "کلمه عبور", "required_username" => "", "username" => "نام کاربری", diff --git a/app/Language/fr/Login.php b/app/Language/fr/Login.php index 5eb13d5c2..9ee6b7a08 100644 --- a/app/Language/fr/Login.php +++ b/app/Language/fr/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Login", "logout" => "Déconnexion", "migration_needed" => "Une migration de base de données vers {0} débutera après l'ouverture de session.", + "migration_required" => "Migration de base de données requise", + "migration_auth_message" => "Les identifiants administrateur sont requis pour autoriser la migration de la base de données vers la version {0}. Veuillez vous connecter pour continuer.", + "migration_initializing" => "Initialisation de la base de données", + "migration_running" => "Exécution des migrations de la base de données...", + "migration_complete" => "Base de données initialisée avec succès !", + "migration_complete_login" => "Vous pouvez maintenant vous connecter.", + "migration_failed" => "Échec de la migration", + "migration_error_connection" => "Erreur de connexion. Veuillez réessayer.", + "migration_complete_redirect" => "Migration terminée. Redirection vers la connexion...", "password" => "Mot de passe", "required_username" => "Le champ nom utilisateur est obligatoire.", "username" => "Nom d'utilisateur", diff --git a/app/Language/he/Login.php b/app/Language/he/Login.php index c1809b79d..aa1ef1cea 100644 --- a/app/Language/he/Login.php +++ b/app/Language/he/Login.php @@ -9,6 +9,15 @@ return [ "login" => "כניסה", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "סיסמה", "required_username" => "", "username" => "שם משתמש", diff --git a/app/Language/hr-HR/Login.php b/app/Language/hr-HR/Login.php index 8bb5cac4a..559465600 100644 --- a/app/Language/hr-HR/Login.php +++ b/app/Language/hr-HR/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Prijava", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Lozinka", "required_username" => "", "username" => "Korisničko ime", diff --git a/app/Language/hu/Login.php b/app/Language/hu/Login.php index 0a2e55dfc..74854cbbe 100644 --- a/app/Language/hu/Login.php +++ b/app/Language/hu/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Belépés", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Jelszó", "required_username" => "", "username" => "Felhasználó név", diff --git a/app/Language/hy/Login.php b/app/Language/hy/Login.php index d443ab5b5..652c3f22c 100644 --- a/app/Language/hy/Login.php +++ b/app/Language/hy/Login.php @@ -9,6 +9,15 @@ return [ "login" => "", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "", "required_username" => "", "username" => "", diff --git a/app/Language/id/Login.php b/app/Language/id/Login.php index f1a1c4dd9..a3b57ccd5 100644 --- a/app/Language/id/Login.php +++ b/app/Language/id/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Masuk", "logout" => "Keluar", "migration_needed" => "Migrasi basis data untuk {0} akan mulai setelah masuk.", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Kata kunci", "required_username" => "Kolom nama pengguna wajib diisi.", "username" => "Nama Anda", diff --git a/app/Language/it/Login.php b/app/Language/it/Login.php index d5cd91867..b353ac821 100644 --- a/app/Language/it/Login.php +++ b/app/Language/it/Login.php @@ -9,8 +9,17 @@ return [ "login" => "Login", "logout" => "Uscita", "migration_needed" => "Dopo l'accesso verrà avviata una migrazione del database a {0}.", + "migration_required" => "Migratione del database richiesta", + "migration_auth_message" => "Le credenziali di amministratore sono richieste per autorizzare la migrazione del database alla versione {0}. Effettua il login per continuare.", + "migration_initializing" => "Inizializzazione database", + "migration_running" => "Esecuzione migrazioni database...", + "migration_complete" => "Database inizializzato con successo!", + "migration_complete_login" => "È ora possibile effettuare il login.", + "migration_failed" => "Migrazione fallita", + "migration_error_connection" => "Errore di connessione. Riprova.", + "migration_complete_redirect" => "Migrazione completata. Reindirizzamento al login...", "password" => "Password", - "required_username" => "", + "required_username" => "Il campo nome utente è obbligatorio.", "username" => "Username", "welcome" => "Benvenuto in {0}!", ]; diff --git a/app/Language/km/Login.php b/app/Language/km/Login.php index 5ce999603..ea92cd2de 100644 --- a/app/Language/km/Login.php +++ b/app/Language/km/Login.php @@ -9,6 +9,15 @@ return [ "login" => "ចូល", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "ពាក្យសំងាត់", "required_username" => "", "username" => "ឈ្មោះ", diff --git a/app/Language/lo/Login.php b/app/Language/lo/Login.php index 610a1a35f..89e65f643 100644 --- a/app/Language/lo/Login.php +++ b/app/Language/lo/Login.php @@ -9,6 +9,15 @@ return [ "login" => "ເຂົ້າລະບົບ", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Password", "required_username" => "", "username" => "Username", diff --git a/app/Language/ml/Login.php b/app/Language/ml/Login.php index d443ab5b5..652c3f22c 100644 --- a/app/Language/ml/Login.php +++ b/app/Language/ml/Login.php @@ -9,6 +9,15 @@ return [ "login" => "", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "", "required_username" => "", "username" => "", diff --git a/app/Language/nb/Login.php b/app/Language/nb/Login.php index d443ab5b5..652c3f22c 100644 --- a/app/Language/nb/Login.php +++ b/app/Language/nb/Login.php @@ -9,6 +9,15 @@ return [ "login" => "", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "", "required_username" => "", "username" => "", diff --git a/app/Language/nl-BE/Login.php b/app/Language/nl-BE/Login.php index cb3527d33..7b4e68ffe 100644 --- a/app/Language/nl-BE/Login.php +++ b/app/Language/nl-BE/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Login", "logout" => "Log-uit", "migration_needed" => "Een database migratie naar {0} zal starten na het inloggen.", + "migration_required" => "Database migratie vereist", + "migration_auth_message" => "Beheerdersreferenties zijn vereist om de databasemigratie naar versie {0} te autoriseren. Log in om verder te gaan.", + "migration_initializing" => "Database initialiseren", + "migration_running" => "Databasemigraties uitvoeren...", + "migration_complete" => "Database succesvol geïnitialiseerd!", + "migration_complete_login" => "U kunt nu inloggen.", + "migration_failed" => "Migratie mislukt", + "migration_error_connection" => "Verbindingsfout. Probeer het opnieuw.", + "migration_complete_redirect" => "Migratie voltooid. Doorsturen naar login...", "password" => "Paswoord", "required_username" => "", "username" => "Gebruiker", diff --git a/app/Language/nl-NL/Login.php b/app/Language/nl-NL/Login.php index 9dfde1688..0f1117123 100644 --- a/app/Language/nl-NL/Login.php +++ b/app/Language/nl-NL/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Aanmelden", "logout" => "Afmelden", "migration_needed" => "Een databasemigratie naar {0} zal starten na aanmelding.", + "migration_required" => "Database migratie vereist", + "migration_auth_message" => "Beheerdersreferenties zijn vereist om de databasemigratie naar versie {0} te autoriseren. Log in om verder te gaan.", + "migration_initializing" => "Database initialiseren", + "migration_running" => "Databasemigraties uitvoeren...", + "migration_complete" => "Database succesvol geïnitialiseerd!", + "migration_complete_login" => "U kunt nu inloggen.", + "migration_failed" => "Migratie mislukt", + "migration_error_connection" => "Verbindingsfout. Probeer het opnieuw.", + "migration_complete_redirect" => "Migratie voltooid. Doorsturen naar login...", "password" => "Wachtwoord", "required_username" => "Het gebruikersnaam veld is verplicht.", "username" => "Gebruikersnaam", diff --git a/app/Language/pl/Login.php b/app/Language/pl/Login.php index 399a94a22..99b359e9a 100644 --- a/app/Language/pl/Login.php +++ b/app/Language/pl/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Zaloguj", "logout" => "Wyloguj", "migration_needed" => "Migracja bazy danych do {0} zacznie się po zalogowaniu.", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Hasło", "required_username" => "", "username" => "Nazwa użytkownika", diff --git a/app/Language/pt-BR/Login.php b/app/Language/pt-BR/Login.php index 92504e3c2..f54b518a7 100644 --- a/app/Language/pt-BR/Login.php +++ b/app/Language/pt-BR/Login.php @@ -9,8 +9,17 @@ return [ 'login' => "Autenticação", 'logout' => "Sair", 'migration_needed' => "Uma migração do banco de dados para {0} será iniciada após o login.", + 'migration_required' => "Migração de banco de dados necessária", + 'migration_auth_message' => "Credenciais de administrador são necessárias para autorizar a migração do banco de dados para a versão {0}. Faça login para continuar.", + 'migration_initializing' => "Inicializando banco de dados", + 'migration_running' => "Executando migrações do banco de dados...", + 'migration_complete' => "Banco de dados inicializado com sucesso!", + 'migration_complete_login' => "Agora você pode fazer login.", + 'migration_failed' => "Migração falhou", + 'migration_error_connection' => "Erro de conexão. Por favor, tente novamente.", + 'migration_complete_redirect' => "Migração concluída. Redirecionando para login...", 'password' => "Senha", 'required_username' => "O campo nome de usuário é obrigatório.", 'username' => "Usuário", - 'welcome' => "Bem-vindo！", + 'welcome' => "Bem-vindo ao {0}!", ]; diff --git a/app/Language/ro/Login.php b/app/Language/ro/Login.php index d443ab5b5..652c3f22c 100644 --- a/app/Language/ro/Login.php +++ b/app/Language/ro/Login.php @@ -9,6 +9,15 @@ return [ "login" => "", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "", "required_username" => "", "username" => "", diff --git a/app/Language/ru/Login.php b/app/Language/ru/Login.php index 9390a626c..257362295 100644 --- a/app/Language/ru/Login.php +++ b/app/Language/ru/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Вход", "logout" => "Выход", "migration_needed" => "Миграция базы данных в {0} начнется после входа в систему.", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Пароль", "required_username" => "", "username" => "Имя пользователя", diff --git a/app/Language/sv/Login.php b/app/Language/sv/Login.php index 32b49ebc7..3cb286958 100644 --- a/app/Language/sv/Login.php +++ b/app/Language/sv/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Login", "logout" => "Logga ut", "migration_needed" => "En migration av databasen till {0} kommer att påbörjas efter inloggningen.", + "migration_required" => "Databasmigration krävs", + "migration_auth_message" => "Admin-uppgifter krävs för att godkänna databasmigrationen till version {0}. Logga in för att fortsätta.", + "migration_initializing" => "Initierar databas", + "migration_running" => "Kör databasmigrationer...", + "migration_complete" => "Databas initierad framgångsrikt!", + "migration_complete_login" => "Du kan nu logga in.", + "migration_failed" => "Migration misslyckades", + "migration_error_connection" => "Anslutningsfel. Försök igen.", + "migration_complete_redirect" => "Migration klar. Omdirigerar till login...", "password" => "Lösenord", "required_username" => "Fältet för användarnamn krävs.", "username" => "Användarnamn", diff --git a/app/Language/sw-KE/Login.php b/app/Language/sw-KE/Login.php index 4ec8895af..15d9468d4 100644 --- a/app/Language/sw-KE/Login.php +++ b/app/Language/sw-KE/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Ingia", "logout" => "Toka", "migration_needed" => "Uhamishaji wa kanzidata hadi {0} utaanza baada ya kuingia.", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Nenosiri", "required_username" => "Jina la mtumiaji ni lazima.", "username" => "Jina la Mtumiaji", diff --git a/app/Language/sw-TZ/Login.php b/app/Language/sw-TZ/Login.php index 4ec8895af..15d9468d4 100644 --- a/app/Language/sw-TZ/Login.php +++ b/app/Language/sw-TZ/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Ingia", "logout" => "Toka", "migration_needed" => "Uhamishaji wa kanzidata hadi {0} utaanza baada ya kuingia.", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Nenosiri", "required_username" => "Jina la mtumiaji ni lazima.", "username" => "Jina la Mtumiaji", diff --git a/app/Language/ta/Login.php b/app/Language/ta/Login.php index 549b3baa1..02a07a776 100644 --- a/app/Language/ta/Login.php +++ b/app/Language/ta/Login.php @@ -9,6 +9,15 @@ return [ "login" => "உள்நுழைய", "logout" => "விடுபதிகை", "migration_needed" => "{0} க்கு தரவுத்தள இடம்பெயர்வு உள்நுழைந்த பிறகு தொடங்கும்.", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "கடவுச்சொல்", "required_username" => "", "username" => "பயனர்பெயர்", diff --git a/app/Language/th/Login.php b/app/Language/th/Login.php index 484045b1e..e9b7b7cd1 100644 --- a/app/Language/th/Login.php +++ b/app/Language/th/Login.php @@ -9,6 +9,15 @@ return [ "login" => "ลงชื่อเข้าใช้", "logout" => "ออกจากระบบ", "migration_needed" => "การย้ายฐานข้อมูลไปยัง {0} จะเริ่มต้นหลังจากเข้าสู่ระบบ", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "รหัสผ่าน", "required_username" => "จำเป็นต้องระบุชื่อผู้ใช้งาน", "username" => "ชื่อผู้ใช้", diff --git a/app/Language/tl/Login.php b/app/Language/tl/Login.php index b8436ee75..bbf0052a2 100644 --- a/app/Language/tl/Login.php +++ b/app/Language/tl/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Login", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Password", "required_username" => "", "username" => "Username", diff --git a/app/Language/tr/Login.php b/app/Language/tr/Login.php index 1174251db..d0a469d91 100644 --- a/app/Language/tr/Login.php +++ b/app/Language/tr/Login.php @@ -9,8 +9,17 @@ return [ "login" => "Giriş", "logout" => "Çıkış", "migration_needed" => "Girişten sonra {0} veri tabanına göç başlayacak.", + "migration_required" => "Veritabanı Göçü Gerekli", + "migration_auth_message" => "Veritabanı göçünün {0} versiyonuna yetkilendirilmesi için yönetici kimlik bilgileri gereklidir. Devam etmek için giriş yapın.", + "migration_initializing" => "Veritabanı başlatılıyor", + "migration_running" => "Veritabanı göçleri çalışıyor...", + "migration_complete" => "Veritabanı başarıyla başlatıldı!", + "migration_complete_login" => "Artık giriş yapabilirsiniz.", + "migration_failed" => "Göç başarısız oldu", + "migration_error_connection" => "Bağlantı hatası. Lütfen tekrar deneyin.", + "migration_complete_redirect" => "Göç tamamlandı. Girişe yönlendiriliyor...", "password" => "Parola", - "required_username" => "", + "required_username" => "Kullanıcı adı alanı gereklidir.", "username" => "Kullanıcı Adı", "welcome" => "{0}'e Hoş Geldiniz!", ]; diff --git a/app/Language/uk/Login.php b/app/Language/uk/Login.php index d63460602..dc30eb1bd 100644 --- a/app/Language/uk/Login.php +++ b/app/Language/uk/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Логін", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Пароль", "required_username" => "", "username" => "Ім'я користувача", diff --git a/app/Language/ur/Login.php b/app/Language/ur/Login.php index d443ab5b5..652c3f22c 100644 --- a/app/Language/ur/Login.php +++ b/app/Language/ur/Login.php @@ -9,6 +9,15 @@ return [ "login" => "", "logout" => "", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "", "required_username" => "", "username" => "", diff --git a/app/Language/vi/Login.php b/app/Language/vi/Login.php index 12bedf6a7..140537698 100644 --- a/app/Language/vi/Login.php +++ b/app/Language/vi/Login.php @@ -9,6 +9,15 @@ return [ "login" => "Đăng nhập", "logout" => "Đăng xuất", "migration_needed" => "Di chuyển cơ sở dữ liệu sang {0} sẽ được bắt đầu sau khi đăng nhập.", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "Mật khẩu", "required_username" => "", "username" => "Tài khoản", diff --git a/app/Language/zh-Hans/Login.php b/app/Language/zh-Hans/Login.php index 12d7f538e..c7802344e 100644 --- a/app/Language/zh-Hans/Login.php +++ b/app/Language/zh-Hans/Login.php @@ -9,6 +9,15 @@ return [ "login" => "登入", "logout" => "退出", "migration_needed" => "", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "密码", "username" => "用户名", "welcome" => "欢迎来到 {0}!", diff --git a/app/Language/zh-Hant/Login.php b/app/Language/zh-Hant/Login.php index eb0264ca0..22b500516 100644 --- a/app/Language/zh-Hant/Login.php +++ b/app/Language/zh-Hant/Login.php @@ -9,6 +9,15 @@ return [ "login" => "登入", "logout" => "登出", "migration_needed" => "登錄後將開始向 {0} 的數據庫遷移。", + "migration_required" => "", + "migration_auth_message" => "", + "migration_initializing" => "", + "migration_running" => "", + "migration_complete" => "", + "migration_complete_login" => "", + "migration_failed" => "", + "migration_error_connection" => "", + "migration_complete_redirect" => "", "password" => "密碼", "required_username" => "", "username" => "帳號", diff --git a/app/Libraries/MY_Migration.php b/app/Libraries/MY_Migration.php index 951b50a14..b0187eb0a 100644 --- a/app/Libraries/MY_Migration.php +++ b/app/Libraries/MY_Migration.php @@ -2,6 +2,7 @@ namespace App\Libraries; +use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\Database\MigrationRunner; use Config\Database; use stdClass; @@ -35,11 +36,16 @@ class MY_Migration extends MigrationRunner */ public static function get_current_version(): int { - $db = Database::connect(); - if ($db->tableExists('migrations')) { - $builder = $db->table('migrations'); - $builder->select('version')->orderBy('version', 'DESC')->limit(1); - return $builder->get()->getRow()->version; + try { + $db = Database::connect(); + if ($db->tableExists('migrations')) { + $builder = $db->table('migrations'); + $builder->select('version')->orderBy('version', 'DESC')->limit(1); + $result = $builder->get()->getRow(); + return $result ? $result->version : 0; + } + } catch (DatabaseException $e) { + return 0; } return 0; @@ -63,10 +69,15 @@ class MY_Migration extends MigrationRunner */ private function ci3_migrations_exists(): bool|string { - if ($this->db->tableExists('migrations') && !$this->db->fieldExists('id', 'migrations')) { - $builder = $this->db->table('migrations'); - $builder->select('version'); - return $builder->get()->getRow()->version; + try { + if ($this->db->tableExists('migrations') && !$this->db->fieldExists('id', 'migrations')) { + $builder = $this->db->table('migrations'); + $builder->select('version'); + $result = $builder->get()->getRow(); + return $result ? $result->version : false; + } + } catch (DatabaseException $e) { + // Database doesn't exist yet or connection failed } return false; @@ -143,4 +154,5 @@ class MY_Migration extends MigrationRunner $this->ensureTable(); } + } diff --git a/app/Views/login.php b/app/Views/login.php index b79e8c89f..51487c44e 100644 --- a/app/Views/login.php +++ b/app/Views/login.php @@ -2,6 +2,7 @@ /** * @var bool $has_errors * @var bool $is_latest + * @var bool $is_new_install * @var string $latest_version * @var bool $gcaptcha_enabled * @var array $config @@ -46,15 +47,20 @@