Skip to content

Commit 8be32ae

Browse files
committed
BootstrapCdn 5.3.8
Using BootstrapCdn via rossaddison/bootstrap5 dev-bootstrap538 Revert 8.5 testing to 8.4 in composer.json
1 parent 404d1e6 commit 8be32ae

File tree

10 files changed

+131
-109
lines changed

10 files changed

+131
-109
lines changed

.github/workflows/invoice_build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
php:
4747
- 8.3
4848
- 8.4
49-
- 8.5
5049

5150
steps:
5251
- name: Checkout

.github/workflows/invoice_static.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
steps:
4747
- name: Checkout
48-
uses: actions/checkout@v4
48+
uses: actions/checkout@v6
4949

5050
- name: Install PHP
5151
uses: shivammathur/setup-php@v2

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"minimum-stability": "dev",
1818
"prefer-stable": true,
1919
"require": {
20-
"php": "8.3 - 8.5",
20+
"php": "8.3 - 8.4",
2121
"ext-apcu": "*",
2222
"ext-curl": "*",
2323
"ext-dom": "*",
@@ -72,6 +72,7 @@
7272
"psr/http-server-middleware": "^1.0.2",
7373
"psr/log": "^3.0.2",
7474
"ramsey/uuid": "^4.9.2",
75+
"rossaddison/yii-bootstrap5": "dev-bootstrap538",
7576
"rossaddison/yii-auth-client": "dev-invoice",
7677
"rossaddison/yii-gii": "*",
7778
"sabre/xml": "^4.0.6",
@@ -86,7 +87,6 @@
8687
"yiisoft/arrays": "^3.2.1",
8788
"yiisoft/assets": "^5.1.2",
8889
"yiisoft/auth": "^3.2.1",
89-
"yiisoft/bootstrap5": ">=1",
9090
"yiisoft/cache": "^3.2",
9191
"yiisoft/cache-file": ">=3.2",
9292
"yiisoft/config": "^1.6.2",

composer.lock

Lines changed: 91 additions & 98 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/common/params.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,7 @@
582582
'vat_id' => 'GB123456789',
583583
'tax_code' => 'GBP',
584584
'tax_currency' => 'GBP',
585+
'document_currency' => 'GBP',
585586
'phone' => '02000000000',
586587
'fax' => '0200000000',
587588
'iso_3166_country_identification_code' => 'GB',

resources/views/invoice/info/en/invoice.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@
5050
<p>Retest signing up procedure because middleware authentication class moved into group header</p>
5151
<p>Payment gateway testing on alpine</p>
5252
<p>Callback traits i.e. C:\wamp128\www\invoice\src\Auth\Trait\Callback.php still to be tested</p>
53+
<p><b>7th February 2026</b></p>
54+
<p>Using BootstrapCdn via rossaddison/bootstrap5 dev-bootstrap538</p>
55+
<p>Revert 8.5 testing to 8.4 in composer.json</p>
5356
<p><b>30th January 2026</b></p>
5457
<p>Sorted config/common/routes.php according to permission $pVI and $pEI.</p>
5558
<p>Added rbac to those $pVI routes which were susceptible to browser

src/Asset/AppAsset.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
namespace App\Asset;
66

7+
use App\Invoice\Asset\NodeModulesAsset;
78
use Yiisoft\Assets\AssetBundle;
8-
use Yiisoft\Bootstrap5\Assets\BootstrapAsset;
9+
use Yiisoft\Bootstrap5\Assets\BootstrapCdnAsset;
910

1011
final class AppAsset extends AssetBundle
1112
{
@@ -24,7 +25,9 @@ final class AppAsset extends AssetBundle
2425
];
2526

2627
public array $depends = [
27-
BootstrapAsset::class,
28-
Bootstrap5IconsAsset::class,
28+
// necessary for the invoice\resources\views\layout\guest.php
29+
BootstrapCdnAsset::class,
30+
// loads the package.json's node_module/bootstrap-icons
31+
NodeModulesAsset::class,
2932
];
3033
}

src/Invoice/Asset/InvoiceAsset.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ class InvoiceAsset extends AssetBundle
1919
'invoice/css/style.css',
2020
'yii3i/yii3i.css',
2121

22-
// bootstrapicons
23-
'//cdn.jsdelivr.net/npm/bootstrap-icons@1.13.1/font/bootstrap-icons.min.css',
24-
'//cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css',
25-
2622
// Automatic asterisk * for required form fields
2723
'rebuild/css/form.css',
2824

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace App\Invoice\Asset;
6+
7+
use Yiisoft\Assets\AssetBundle;
8+
9+
class NodeModulesAsset extends AssetBundle
10+
{
11+
public ?string $basePath = '@assets';
12+
13+
public ?string $baseUrl = '@assetsUrl';
14+
15+
public ?string $sourcePath = '@npm/bootstrap-icons/font';
16+
17+
/** @psalm-suppress NonInvariantDocblockPropertyType */
18+
public array $css = [
19+
'bootstrap-icons.min.css',
20+
];
21+
22+
/** @psalm-suppress NonInvariantDocblockPropertyType */
23+
public array $js = [
24+
];
25+
}

src/Invoice/Setting/SettingRepository.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,7 @@ public function get_config_company_details(): array
778778
* @var string $params['company']['vat_id']
779779
* @var string $params['company']['tax_code']
780780
* @var string $params['company']['tax_currency'],
781+
* @var string $params['company']['document_currency'],
781782
* @var string $params['company']['phone']
782783
* @var string $params['company']['fax']
783784
* @var string $params['company']['iso_3166_country_identification_code']
@@ -795,6 +796,7 @@ public function get_config_company_details(): array
795796
'vat_id' => $params['company']['vat_id'],
796797
'tax_code' => $params['company']['tax_code'],
797798
'tax_currency' => $params['company']['tax_currency'],
799+
'document_currency' => $params['company']['document_currency'],
798800
'phone' => $params['company']['phone'],
799801
'fax' => $params['company']['fax'],
800802
'iso_3166_country_identification_code' =>

0 commit comments

Comments
 (0)