Skip to content

Commit faeb037

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <[email protected]> # Conflicts: # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json
2 parents 07602f6 + bfc1224 commit faeb037

24 files changed

+153
-49
lines changed

‎app/Http/Transformers/AccessoriesTransformer.php‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,10 @@ public function transformAccessory(Accessory $accessory)
3737
'purchase_date' => ($accessory->purchase_date) ? Helper::getFormattedDateObject($accessory->purchase_date, 'date') : null,
3838
'purchase_cost' => Helper::formatCurrencyOutput($accessory->purchase_cost),
3939
'order_number' => ($accessory->order_number) ? e($accessory->order_number) : null,
40-
'min_qty' => ($accessory->min_amt) ? (int) $accessory->min_amt : null,
41-
'remaining_qty' => (int) ($accessory->qty - $accessory->checkouts_count),
40+
'min_qty' => ($accessory->min_amt) ? (int) $accessory->min_amt : null, // Legacy - should phase out - replaced by below, for the bootstrap table formatter
41+
'min_amt' => ($accessory->min_amt) ? (int) $accessory->min_amt : null,
42+
'remaining_qty' => (int) ($accessory->qty - $accessory->checkouts_count), // Legacy - should phase out - replaced by below, for the bootstrap table formatter
43+
'remaining' => (int) ($accessory->qty - $accessory->checkouts_count),
4244
'checkouts_count' => $accessory->checkouts_count,
4345
'created_by' => ($accessory->adminuser) ? [
4446
'id' => (int) $accessory->adminuser->id,

‎app/Http/Transformers/AssetModelsTransformer.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ public function transformAssetModel(AssetModel $assetmodel)
4646
'name'=> e($assetmodel->manufacturer->name),
4747
] : null,
4848
'image' => ($assetmodel->image != '') ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null,
49-
'model_number' => e($assetmodel->model_number),
49+
'model_number' => ($assetmodel->model_number ? e($assetmodel->model_number): null),
5050
'min_amt' => ($assetmodel->min_amt) ? (int) $assetmodel->min_amt : null,
51+
'remaining' => (int) ($assetmodel->assets_count - $assetmodel->min_amt),
5152
'depreciation' => ($assetmodel->depreciation) ? [
5253
'id' => (int) $assetmodel->depreciation->id,
5354
'name'=> e($assetmodel->depreciation->name),

‎app/Http/Transformers/LicensesTransformer.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public function transformLicense(License $license)
3838
'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'),
3939
'seats' => (int) $license->seats,
4040
'free_seats_count' => (int) $license->free_seats_count,
41+
'remaining' => (int) $license->free_seats_count,
4142
'min_amt' => ($license->min_amt) ? (int) ($license->min_amt) : null,
4243
'license_name' => ($license->license_name) ? e($license->license_name) : null,
4344
'license_email' => ($license->license_email) ? e($license->license_email) : null,

‎app/Presenters/AccessoryPresenter.php‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,28 +78,36 @@ public static function dataTableLayout()
7878
'sortable' => true,
7979
'title' => trans('general.location'),
8080
'formatter' => 'locationsLinkObjFormatter',
81+
], [
82+
'field' => 'min_amt',
83+
'searchable' => false,
84+
'sortable' => true,
85+
'title' => trans('general.min_amt'),
86+
'formatter' => 'minAmtFormatter',
87+
'class' => 'text-right text-padding-number-cell',
8188
], [
8289
'field' => 'qty',
8390
'searchable' => false,
8491
'sortable' => true,
8592
'title' => trans('admin/accessories/general.total'),
93+
'footerFormatter' => 'qtySumFormatter',
94+
'class' => 'text-right text-padding-number-cell',
8695
], [
87-
'field' => 'remaining_qty',
96+
'field' => 'remaining',
8897
'searchable' => false,
8998
'sortable' => false,
9099
'visible' => false,
91100
'title' => trans('admin/accessories/general.remaining'),
101+
'footerFormatter' => 'qtySumFormatter',
102+
'class' => 'text-right text-padding-number-cell',
92103
],[
93104
'field' => 'checkouts_count',
94105
'searchable' => false,
95106
'sortable' => true,
96107
'visible' => true,
97108
'title' => trans('general.checked_out'),
98-
], [
99-
'field' => 'min_qty',
100-
'searchable' => false,
101-
'sortable' => true,
102-
'title' => trans('general.min_amt'),
109+
'footerFormatter' => 'qtySumFormatter',
110+
'class' => 'text-right text-padding-number-cell',
103111
], [
104112
'field' => 'purchase_date',
105113
'searchable' => true,
@@ -113,7 +121,7 @@ public static function dataTableLayout()
113121
'sortable' => true,
114122
'title' => trans('general.purchase_cost'),
115123
'footerFormatter' => 'sumFormatterQuantity',
116-
'class' => 'text-right',
124+
'class' => 'text-right text-padding-number-cell',
117125
], [
118126
'field' => 'order_number',
119127
'searchable' => true,

‎app/Presenters/AssetModelPresenter.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,30 @@ public static function dataTableLayout()
7474
'switchable' => true,
7575
'title' => trans('mail.min_QTY'),
7676
'visible' => true,
77+
'formatter' => 'minAmtFormatter',
78+
'class' => 'text-right text-padding-number-cell',
7779
],
80+
7881
[
7982
'field' => 'assets_count',
8083
'searchable' => false,
8184
'sortable' => true,
8285
'switchable' => true,
8386
'title' => trans('admin/models/table.numassets'),
8487
'visible' => true,
88+
'class' => 'text-right text-padding-number-cell',
89+
'footerFormatter' => 'qtySumFormatter',
90+
],
91+
92+
[
93+
'field' => 'remaining',
94+
'searchable' => false,
95+
'sortable' => false,
96+
'switchable' => true,
97+
'title' => trans('general.remaining'),
98+
'visible' => true,
99+
'class' => 'text-right text-padding-number-cell',
100+
'footerFormatter' => 'qtySumFormatter',
85101
],
86102
[
87103
'field' => 'depreciation',

‎app/Presenters/ComponentPresenter.php‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,24 +79,30 @@ public static function dataTableLayout()
7979
'title' => trans('general.manufacturer'),
8080
'visible' => false,
8181
'formatter' => 'manufacturersLinkObjFormatter',
82+
], [
83+
'field' => 'min_amt',
84+
'searchable' => false,
85+
'sortable' => true,
86+
'title' => trans('general.min_amt'),
87+
'visible' => true,
88+
'class' => 'text-right text-padding-number-cell',
89+
'formatter' => 'minAmtFormatter',
8290
], [
8391
'field' => 'qty',
8492
'searchable' => false,
8593
'sortable' => true,
8694
'title' => trans('admin/components/general.total'),
8795
'visible' => true,
96+
'class' => 'text-right text-padding-number-cell',
97+
'footerFormatter' => 'qtySumFormatter',
8898
], [
8999
'field' => 'remaining',
90100
'searchable' => false,
91101
'sortable' => false,
92102
'title' => trans('admin/components/general.remaining'),
93103
'visible' => true,
94-
], [
95-
'field' => 'min_amt',
96-
'searchable' => false,
97-
'sortable' => false,
98-
'title' => trans('general.min_amt'),
99-
'visible' => true,
104+
'class' => 'text-right text-padding-number-cell',
105+
'footerFormatter' => 'qtySumFormatter',
100106
], [
101107
'field' => 'location',
102108
'searchable' => true,

‎app/Presenters/ConsumablePresenter.php‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,25 +72,31 @@ public static function dataTableLayout()
7272
'searchable' => true,
7373
'sortable' => true,
7474
'title' => trans('admin/consumables/general.item_no'),
75+
], [
76+
'field' => 'min_amt',
77+
'searchable' => false,
78+
'sortable' => true,
79+
'title' => trans('general.min_amt'),
80+
'visible' => true,
81+
'formatter' => 'minAmtFormatter',
82+
'class' => 'text-right text-padding-number-cell',
7583
], [
7684
'field' => 'qty',
7785
'searchable' => false,
7886
'sortable' => true,
7987
'title' => trans('admin/components/general.total'),
8088
'visible' => true,
89+
'class' => 'text-right text-padding-number-cell',
90+
'footerFormatter' => 'qtySumFormatter',
8191
], [
8292
'field' => 'remaining',
8393
'searchable' => false,
8494
'sortable' => true,
8595
'title' => trans('admin/components/general.remaining'),
8696
'visible' => true,
97+
'class' => 'text-right text-padding-number-cell',
98+
'footerFormatter' => 'qtySumFormatter',
8799
], [
88-
'field' => 'min_amt',
89-
'searchable' => false,
90-
'sortable' => false,
91-
'title' => trans('general.min_amt'),
92-
'visible' => true,
93-
], [
94100
'field' => 'location',
95101
'searchable' => true,
96102
'sortable' => true,
@@ -123,7 +129,7 @@ public static function dataTableLayout()
123129
'title' => trans('general.purchase_cost'),
124130
'visible' => true,
125131
'footerFormatter' => 'sumFormatterQuantity',
126-
'class' => 'text-right',
132+
'class' => 'text-right text-padding-number-cell',
127133
], [
128134
'field' => 'notes',
129135
'searchable' => true,

‎app/Presenters/LicensePresenter.php‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,24 +80,28 @@ public static function dataTableLayout()
8080
'sortable' => true,
8181
'title' => trans('general.manufacturer'),
8282
'formatter' => 'manufacturersLinkObjFormatter',
83+
], [
84+
'field' => 'min_amt',
85+
'searchable' => false,
86+
'sortable' => true,
87+
'title' => trans('mail.min_QTY'),
88+
'formatter' => 'minAmtFormatter',
89+
'class' => 'text-right text-padding-number-cell',
8390
], [
8491
'field' => 'seats',
8592
'searchable' => false,
8693
'sortable' => true,
8794
'title' => trans('admin/accessories/general.total'),
95+
'class' => 'text-right text-padding-number-cell',
96+
'footerFormatter' => 'qtySumFormatter',
8897
], [
8998
'field' => 'free_seats_count',
9099
'searchable' => false,
91100
'sortable' => true,
92101
'title' => trans('admin/accessories/general.remaining'),
93-
],
94-
[
95-
'field' => 'min_amt',
96-
'searchable' => false,
97-
'sortable' => true,
98-
'title' => trans('mail.min_QTY'),
99-
'formatter' => 'minAmtFormatter',
100-
],[
102+
'class' => 'text-right text-padding-number-cell',
103+
'footerFormatter' => 'qtySumFormatter',
104+
], [
101105
'field' => 'purchase_date',
102106
'searchable' => true,
103107
'sortable' => true,

‎public/css/build/app.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/css/build/overrides.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)