Skip to content

Commit c7a0d8e

Browse files
sampoyigisampoyigi
committed
Merge branch 'develop'
2 parents e2ebc0a + 1398368 commit c7a0d8e

File tree

18 files changed

+275
-255
lines changed

18 files changed

+275
-255
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,24 @@ jobs:
1616
max-parallel: 6
1717
matrix:
1818
# os: [ubuntu-latest, windows-latest]
19-
php: ['7.4', '8.0']
20-
db: ['mysql:5.7', mariadb]
19+
php: ['7.4', '8.0', '8.1']
20+
db: ['mysql:5.7', 'mysql:8.0', 'mariadb:10.2', 'mariadb:10.6']
2121
include:
2222
- db: 'mysql:5.7'
23-
dbName: MySQL
24-
- db: mariadb
25-
dbName: MariaDB
23+
dbName: 'MySQL 5.7'
24+
- db: 'mysql:8.0'
25+
dbName: 'MySQL'
26+
- db: 'mariadb:10.2'
27+
dbName: 'MariaDB 10.2'
28+
- db: 'mariadb:10.6'
29+
dbName: 'MariaDB'
2630
fail-fast: false
2731

2832
services:
2933
mysql:
3034
image: ${{ matrix.db }}
3135
ports:
32-
- 13306:3306
36+
- 3306
3337

3438
name: 'PHPUnit Tests ${{ matrix.php }} / ${{ matrix.dbName }}'
3539

@@ -40,7 +44,7 @@ jobs:
4044
- name: Create MySQL Database
4145
run: |
4246
sudo systemctl start mysql
43-
mysql -uroot -proot -e 'CREATE DATABASE ti_test;' --port 13306
47+
mysql -u${{ env.DB_USERNAME }} -p${{ env.DB_PASSWORD }} -e 'CREATE DATABASE ${{ env.DB_DATABASE }};' --port ${{ env.DB_PORT }}
4448
4549
- name: Install PHP
4650
uses: shivammathur/setup-php@master
@@ -49,7 +53,7 @@ jobs:
4953
extensions: mbstring, intl, gd, xml, sqlite
5054

5155
- name: Install composer dependencies
52-
run: composer install --no-interaction --prefer-dist --no-progress --no-suggest --no-scripts
56+
run: composer install --no-interaction --prefer-dist --no-progress --no-scripts
5357

5458
- name: Reset TastyIgniter library
5559
run: |
@@ -59,16 +63,21 @@ jobs:
5963
unzip ./vendor/tastyigniter/master.zip -d ./vendor/tastyigniter
6064
mv ./vendor/tastyigniter/flame-master ./vendor/tastyigniter/flame
6165
composer dump-autoload
62-
env:
63-
DB_PORT: 13306
64-
DB_PASSWORD: root
65-
DB_PREFIX: ${{ matrix.prefix }}
6666
6767
- name: Run composer post-update scripts
6868
run: |
6969
php artisan key:generate --force
70+
php artisan igniter:install --no-interaction
7071
php artisan igniter:util set version
7172
php artisan package:discover
7273
7374
- name: Run PHPUnit Test Suite
7475
run: ./vendor/bin/phpunit
76+
77+
env:
78+
DB_PORT: 3306
79+
DB_DATABASE: test
80+
DB_USERNAME: root
81+
DB_PASSWORD: root
82+
DB_PREFIX: 'ti_'
83+
IGNITER_LOCATION_MODE: multiple

‎app/admin/controllers/Orders.php‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -109,19 +109,6 @@ public function invoice($context, $recordId = null)
109109
$this->suppressLayout = TRUE;
110110
}
111111

112-
public function formExtendFieldsBefore($form)
113-
{
114-
if (!array_key_exists('invoice_number', $form->tabs['fields']))
115-
return;
116-
117-
if (!$form->model->hasInvoice()) {
118-
array_pull($form->tabs['fields']['invoice_number'], 'addonRight');
119-
}
120-
else {
121-
$form->tabs['fields']['invoice_number']['addonRight']['attributes']['href'] = admin_url('orders/invoice/'.$form->model->getKey());
122-
}
123-
}
124-
125112
public function formExtendQuery($query)
126113
{
127114
$query->with([

‎app/admin/language/en/lang.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -776,6 +776,7 @@
776776
'text_invoice_date' => 'Invoice Date',
777777
'text_order_date' => 'Order Date',
778778
'text_deliver_to' => 'Deliver to',
779+
'text_asap' => 'ASAP',
779780
'text_invoice_thank_you' => 'Thank you for your order',
780781
'text_collection_order_type' => 'This is a pick-up order',
781782
'text_no_payment' => 'No payment method selected',
@@ -799,6 +800,7 @@
799800
'column_notify' => 'Customer Notified',
800801
'column_name_option' => 'Name/Options',
801802
'column_price' => 'Price',
803+
'column_quantity' => 'Qty',
802804

803805
'label_order_id' => 'Order ID',
804806
'label_customer_name' => 'Customer Name',
@@ -808,9 +810,10 @@
808810
'label_time_is_asap' => 'Order Time Is Asap',
809811
'label_order_time' => 'Delivery/Pick-up Time',
810812
'label_order_date' => 'Delivery/Pick-up Date',
813+
'label_order_date_time' => 'Delivery/Pick-up Date Time',
811814
'label_date_added' => 'Date Added',
812815
'label_order_total' => 'Order Total',
813-
'label_comment' => 'Order Comment',
816+
'label_comment' => 'Notes',
814817
'label_date_modified' => 'Date Modified',
815818
'label_user_agent' => 'User Agent',
816819
'label_ip_address' => 'IP Address',
@@ -940,7 +943,7 @@
940943
'text_tab_user' => 'User',
941944

942945
'text_tab_desc_user' => 'Configure registration email confirmation, default customer group, ...',
943-
'text_tab_desc_setup' => 'Configure order and reservation related settings',
946+
'text_tab_desc_setup' => 'Configure order, reservation, invoicing and taxation settings',
944947
],
945948

946949
'staff_groups' => [

‎app/admin/models/config/orders_model.php‎

Lines changed: 14 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@
190190
'disabled' => TRUE,
191191
'path' => 'orders/form/info',
192192
'span' => 'left',
193+
'cssClass' => 'left',
193194
'context' => ['edit', 'preview'],
194195
],
195196
'status_id' => [
@@ -202,127 +203,25 @@
202203
$config['form']['tabs'] = [
203204
'defaultTab' => 'lang:admin::lang.orders.text_tab_general',
204205
'fields' => [
205-
'order_type_name' => [
206-
'label' => 'lang:admin::lang.orders.label_order_type',
207-
'type' => 'text',
208-
'span' => 'left',
209-
'cssClass' => 'flex-width',
210-
'disabled' => TRUE,
211-
'context' => ['edit', 'preview'],
212-
],
213-
'order_time_is_asap' => [
214-
'label' => 'lang:admin::lang.orders.label_time_is_asap',
215-
'type' => 'switch',
216-
'span' => 'left',
217-
'cssClass' => 'flex-width',
218-
'on' => 'lang:admin::lang.text_yes',
219-
'off' => 'lang:admin::lang.text_no',
220-
'disabled' => TRUE,
221-
'context' => ['edit', 'preview'],
222-
],
223-
'location[location_name]' => [
224-
'label' => 'lang:admin::lang.orders.text_restaurant',
225-
'type' => 'location',
226-
'disabled' => TRUE,
227-
'span' => 'right',
228-
'placeholder' => 'lang:admin::lang.text_please_select',
229-
],
230-
'order_date' => [
231-
'label' => 'lang:admin::lang.orders.label_order_date',
232-
'type' => 'datepicker',
233-
'disabled' => TRUE,
234-
'mode' => 'date',
235-
'span' => 'left',
236-
'cssClass' => 'flex-width',
237-
],
238-
'order_time' => [
239-
'label' => 'lang:admin::lang.orders.label_order_time',
240-
'type' => 'datepicker',
241-
'disabled' => TRUE,
242-
'mode' => 'time',
243-
'span' => 'left',
244-
'cssClass' => 'flex-width',
206+
'order_menus' => [
207+
'type' => 'partial',
208+
'path' => 'orders/form/order_menus',
245209
],
246-
'customer[full_name]' => [
210+
'customer' => [
247211
'label' => 'lang:admin::lang.orders.text_customer',
248-
'type' => 'customer',
249-
'disabled' => TRUE,
250-
'span' => 'right',
251-
],
252-
'delivery_address' => [
253-
'label' => 'lang:admin::lang.orders.label_delivery_address',
254-
'span' => 'left',
255-
'valueFrom' => 'formatted_address',
256-
'disabled' => TRUE,
257-
],
258-
'telephone' => [
259-
'label' => 'lang:admin::lang.orders.label_telephone',
260-
'type' => 'text',
261-
'disabled' => TRUE,
262-
'span' => 'right',
263-
'context' => ['edit', 'preview'],
264-
],
265-
'payment_method[name]' => [
266-
'label' => 'lang:admin::lang.orders.label_payment_method',
267-
'span' => 'left',
268-
'type' => 'text',
269-
'disabled' => TRUE,
270-
],
271-
'invoice_number' => [
272-
'label' => 'lang:admin::lang.orders.label_invoice',
273-
'type' => 'addon',
274-
'disabled' => TRUE,
275-
'span' => 'right',
276-
'context' => ['edit', 'preview'],
277-
'addonRight' => [
278-
'tag' => 'a',
279-
'label' => 'admin::lang.orders.button_print_invoice',
280-
'attributes' => [
281-
'class' => 'btn btn-outline-default',
282-
'target' => '_blank',
283-
],
284-
],
285-
],
286-
'comment' => [
287-
'label' => 'lang:admin::lang.orders.label_comment',
288-
'type' => 'textarea',
289-
'disabled' => TRUE,
290-
],
291-
'created_at' => [
292-
'label' => 'lang:admin::lang.orders.label_date_added',
293-
'type' => 'datepicker',
294-
'mode' => 'date',
295-
'disabled' => TRUE,
296-
'span' => 'left',
297-
'context' => ['edit', 'preview'],
298-
],
299-
'ip_address' => [
300-
'label' => 'lang:admin::lang.orders.label_ip_address',
301-
'type' => 'text',
302-
'disabled' => TRUE,
303-
'span' => 'right',
304-
'context' => ['edit', 'preview'],
305-
],
306-
'updated_at' => [
307-
'label' => 'lang:admin::lang.orders.label_date_modified',
308-
'type' => 'datepicker',
309-
'mode' => 'date',
310-
'span' => 'left',
311-
'disabled' => TRUE,
312-
'context' => ['edit', 'preview'],
212+
'type' => 'partial',
213+
'path' => 'orders/form/field_customer',
313214
],
314-
'user_agent' => [
315-
'label' => 'lang:admin::lang.orders.label_user_agent',
316-
'disabled' => TRUE,
317-
'type' => 'text',
318-
'span' => 'right',
319-
'context' => ['edit', 'preview'],
215+
'location' => [
216+
'label' => 'lang:admin::lang.orders.text_restaurant',
217+
'type' => 'partial',
218+
'path' => 'orders/form/field_location',
320219
],
321-
'order_menus' => [
322-
'tab' => 'lang:admin::lang.orders.text_tab_menu',
220+
'order_details' => [
323221
'type' => 'partial',
324-
'path' => 'orders/form/order_menus',
222+
'path' => 'orders/form/order_details',
325223
],
224+
326225
'status_history' => [
327226
'tab' => 'lang:admin::lang.orders.text_status_history',
328227
'type' => 'datatable',

‎app/admin/models/config/setup_settings.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,17 @@
129129
'label' => 'lang:system::lang.settings.label_invoice_prefix',
130130
'tab' => 'lang:system::lang.settings.text_tab_title_invoice',
131131
'type' => 'text',
132+
'span' => 'left',
132133
'comment' => 'lang:system::lang.settings.help_invoice_prefix',
133134
],
135+
'invoice_logo' => [
136+
'label' => 'lang:system::lang.settings.label_invoice_logo',
137+
'tab' => 'lang:system::lang.settings.text_tab_title_invoice',
138+
'type' => 'mediafinder',
139+
'span' => 'right',
140+
'mode' => 'inline',
141+
'comment' => 'lang:system::lang.settings.help_invoice_logo',
142+
],
134143

135144
'tax_mode' => [
136145
'label' => 'lang:system::lang.settings.label_tax_mode',
@@ -184,6 +193,7 @@
184193
['guest_order', 'lang:system::lang.settings.label_guest_order', 'required|integer'],
185194
['location_order', 'lang:system::lang.settings.label_location_order', 'required|integer'],
186195
['invoice_prefix', 'lang:system::lang.settings.label_invoice_prefix'],
196+
['invoice_logo', 'lang:system::lang.settings.label_invoice_logo', 'string'],
187197
],
188198
],
189199
];

‎app/admin/views/orders/form/field_customer.blade.php‎

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
1-
@php $fieldValue = sprintf('%s (%s)', $formModel->customer_name, $formModel->email) @endphp
2-
@if($this->previewMode)
3-
<p class="form-control-static">{{ $fieldValue ?: '&nbsp;' }}</p>
4-
@else
5-
<input
6-
type="text"
7-
name="{{ $field->getName() }}"
8-
id="{{ $field->getId() }}"
9-
value="{{ $fieldValue }}"
10-
placeholder="{{ $field->placeholder }}"
11-
class="form-control"
12-
autocomplete="off"
13-
{!! $field->hasAttribute('maxlength') ? '' : 'maxlength="255"' !!}
14-
{!! $field->getAttributes() !!}
15-
/>
1+
<div class="card-body">
2+
<h5 class="card-title">@lang($field->label)</h5>
3+
<div class="py-2 lead">
4+
@if ($formModel->customer)
5+
<a href="{{ admin_url('customers/preview/'.$formModel->customer_id) }}">{{ $formModel->customer_name }}</a>
6+
@else
7+
{{ $formModel->customer_name }}
8+
@endif
9+
</div>
10+
<div class="py-2">
11+
<i class="fa fa-envelope fa-fw text-muted"></i>&nbsp;&nbsp;
12+
{{ $formModel->email }}
13+
</div>
14+
<div class="py-2">
15+
<i class="fa fa-phone fa-fw text-muted"></i>&nbsp;&nbsp;
16+
{{ $formModel->telephone }}
17+
</div>
18+
</div>
19+
@if ($formModel->isDeliveryType())
20+
<div class="card-body border-top">
21+
<h5 class="card-title">@lang('admin::lang.orders.label_delivery_address')</h5>
22+
<div class="py-2">
23+
{!! format_address($formModel->address->toArray()) !!}
24+
</div>
25+
</div>
1626
@endif

‎app/admin/views/orders/form/field_location.blade.php‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,4 @@
1-
@php
2-
$location = $formModel->location;
3-
$fieldValue = sprintf('%s (%s)', $location->location_name, format_address($location->getAddress(), false));
4-
@endphp
5-
@if($this->previewMode)
6-
<p class="form-control-static">{{ $fieldValue ?: '&nbsp;' }}</p>
7-
@else
8-
<input
9-
type="text"
10-
name="{{ $field->getName() }}"
11-
id="{{ $field->getId() }}"
12-
value="{{ $fieldValue }}"
13-
placeholder="{{ $field->placeholder }}"
14-
class="form-control"
15-
autocomplete="off"
16-
{!! $field->hasAttribute('maxlength') ? '' : 'maxlength="255"' !!}
17-
{!! $field->getAttributes() !!}
18-
/>
19-
@endif
1+
<div class="py-2">
2+
<p class="lead">{{ $formModel->location->location_name }}</p>
3+
{!! format_address($formModel->location->getAddress()) !!}
4+
</div>

0 commit comments

Comments
 (0)