From 4ee776540302b593c8bdd14c67e03ece5ebd6d3a Mon Sep 17 00:00:00 2001 From: madd15 Date: Thu, 12 Oct 2017 06:59:22 +1030 Subject: [PATCH 1/4] Change Save buttons to Checkout and add Cancel (#4202) Bringing components and consumables checkout page inline with other checkout pages --- resources/views/components/checkout.blade.php | 7 ++++--- resources/views/consumables/checkout.blade.php | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/views/components/checkout.blade.php b/resources/views/components/checkout.blade.php index 517939c04..8796d5846 100644 --- a/resources/views/components/checkout.blade.php +++ b/resources/views/components/checkout.blade.php @@ -55,9 +55,10 @@ -
- -
+
+ {{ trans('button.cancel') }} + +
diff --git a/resources/views/consumables/checkout.blade.php b/resources/views/consumables/checkout.blade.php index 6650d5406..b085c8bb9 100644 --- a/resources/views/consumables/checkout.blade.php +++ b/resources/views/consumables/checkout.blade.php @@ -63,9 +63,10 @@ @endif -
- -
+
+ {{ trans('button.cancel') }} + +
From 93990327deb06b6d65f2753544090ab3f2dbdd02 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 11 Oct 2017 14:18:08 -0700 Subject: [PATCH 2/4] Hopefully fixes #4163 --- app/Models/CustomField.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php index d85c75977..c0ddba3cc 100644 --- a/app/Models/CustomField.php +++ b/app/Models/CustomField.php @@ -62,7 +62,9 @@ class CustomField extends Model return true; } - + $platform = Schema::getConnection()->getDoctrineSchemaManager()->getDatabasePlatform(); + $platform->registerDoctrineTypeMapping('enum', 'string'); + Schema::table(CustomField::$table_name, function ($table) use ($custom_field) { $table->renameColumn($custom_field->convertUnicodeDbSlug($custom_field->getOriginal("name")), $custom_field->convertUnicodeDbSlug()); }); From 485b6397d02b60fa1a78fcd563068a1e447d1028 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 11 Oct 2017 14:42:11 -0700 Subject: [PATCH 3/4] Possible (crummy temp) fix for #4165 --- app/Notifications/CheckoutNotification.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/Notifications/CheckoutNotification.php b/app/Notifications/CheckoutNotification.php index 187f6f9e4..e365e8a7a 100644 --- a/app/Notifications/CheckoutNotification.php +++ b/app/Notifications/CheckoutNotification.php @@ -45,13 +45,12 @@ class CheckoutNotification extends Notification $item = $this->params['item']; if (class_basename(get_class($this->params['item']))=='Asset') { - $notifyBy[] = 'mail'; + if ((method_exists($item, 'requireAcceptance') && ($item->requireAcceptance() == '1')) + || (method_exists($item, 'getEula') && ($item->getEula())) + ) { + $notifyBy[] = 'mail'; + } } - // if ((method_exists($item, 'requireAcceptance') && ($item->requireAcceptance()=='1')) - // || (method_exists($item, 'getEula') && ($item->getEula())) - // ) { - // $notifyBy[] = 'mail'; - // } return $notifyBy; } From 6d4574130f1c51f750f12c3360c0b4daf1a22dc1 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 11 Oct 2017 14:44:25 -0700 Subject: [PATCH 4/4] Clearer indication of whether or not the user will be emailed a eula --- app/Http/Controllers/Api/CategoriesController.php | 4 ++-- app/Http/Transformers/CategoriesTransformer.php | 2 +- app/Presenters/CategoryPresenter.php | 7 ++++--- resources/views/hardware/checkin.blade.php | 10 ++++------ 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app/Http/Controllers/Api/CategoriesController.php b/app/Http/Controllers/Api/CategoriesController.php index 944f049f6..82f34754a 100644 --- a/app/Http/Controllers/Api/CategoriesController.php +++ b/app/Http/Controllers/Api/CategoriesController.php @@ -20,9 +20,9 @@ class CategoriesController extends Controller public function index(Request $request) { $this->authorize('view', Category::class); - $allowed_columns = ['id', 'name','category_type','use_default_eula','require_acceptance','checkin_email']; + $allowed_columns = ['id', 'name','category_type','use_default_eula','eula_text', 'require_acceptance','checkin_email']; - $categories = Category::select(['id', 'created_at', 'updated_at', 'name','category_type','use_default_eula','require_acceptance','checkin_email']) + $categories = Category::select(['id', 'created_at', 'updated_at', 'name','category_type','use_default_eula','eula_text', 'require_acceptance','checkin_email']) ->withCount('assets', 'accessories', 'consumables', 'components'); if ($request->has('search')) { diff --git a/app/Http/Transformers/CategoriesTransformer.php b/app/Http/Transformers/CategoriesTransformer.php index bcfa0aec2..edb56c012 100644 --- a/app/Http/Transformers/CategoriesTransformer.php +++ b/app/Http/Transformers/CategoriesTransformer.php @@ -26,7 +26,7 @@ class CategoriesTransformer 'id' => (int) $category->id, 'name' => e($category->name), 'type' => e($category->category_type), - 'use_default_eula' => ($category->use_default_eula =='1') ? true : false, + 'eula' => ($category->getEula()) ? true : false, 'checkin_email' => ($category->checkin_email =='1') ? true : false, 'require_acceptance' => ($category->require_acceptance =='1') ? true : false, 'assets_count' => $category->assets_count, diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.php index 7dbcb4d54..4b545b82d 100644 --- a/app/Presenters/CategoryPresenter.php +++ b/app/Presenters/CategoryPresenter.php @@ -63,20 +63,21 @@ class CategoryPresenter extends Presenter "title" => trans('general.components'), "visible" => true ], [ - "field" => "use_default_eula", + "field" => "eula", "searchable" => false, "sortable" => false, "title" => trans('admin/categories/table.eula_text'), "visible" => false, "formatter" => 'trueFalseFormatter', - ], [ + ], [ "field" => "require_acceptance", "searchable" => false, "sortable" => false, "title" => trans('admin/categories/table.require_acceptance'), "visible" => true, "formatter" => 'trueFalseFormatter', - ], [ + ], + [ "field" => "actions", "searchable" => false, "sortable" => false, diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php index 351be8564..bf365b958 100755 --- a/resources/views/hardware/checkin.blade.php +++ b/resources/views/hardware/checkin.blade.php @@ -91,16 +91,14 @@ {!! $errors->first('note', ' :message') !!} - - +
+ {{ trans('button.cancel') }} +
-
- {{ trans('button.cancel') }} -
+