From 5e67b24866e751bca9c5edb6003c03c0697eeecb Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 16 Jul 2021 15:11:18 +0300 Subject: [PATCH 1/3] move env --- .env_demo | 5 ++++- .../resources/config/settings/sections.php | 1 - .../resources/config/settings/settings.php | 1 - .../advs-module/resources/lang/af/setting.php | 3 --- .../advs-module/resources/lang/ar/setting.php | 3 --- .../advs-module/resources/lang/az/setting.php | 3 --- .../advs-module/resources/lang/bg/setting.php | 3 --- .../advs-module/resources/lang/bn/setting.php | 3 --- .../advs-module/resources/lang/ca/setting.php | 3 --- .../advs-module/resources/lang/cs/setting.php | 3 --- .../advs-module/resources/lang/da/setting.php | 3 --- .../advs-module/resources/lang/de/setting.php | 3 --- .../advs-module/resources/lang/el/setting.php | 3 --- .../advs-module/resources/lang/en/setting.php | 3 --- .../advs-module/resources/lang/es/setting.php | 3 --- .../advs-module/resources/lang/fa/setting.php | 3 --- .../advs-module/resources/lang/fi/setting.php | 3 --- .../advs-module/resources/lang/fr/setting.php | 3 --- .../advs-module/resources/lang/he/setting.php | 3 --- .../advs-module/resources/lang/hi/setting.php | 3 --- .../advs-module/resources/lang/hu/setting.php | 3 --- .../advs-module/resources/lang/id/setting.php | 3 --- .../advs-module/resources/lang/it/setting.php | 3 --- .../advs-module/resources/lang/ja/setting.php | 3 --- .../advs-module/resources/lang/ko/setting.php | 3 --- .../advs-module/resources/lang/ku/setting.php | 3 --- .../advs-module/resources/lang/nl/setting.php | 3 --- .../advs-module/resources/lang/no/setting.php | 3 --- .../advs-module/resources/lang/pl/setting.php | 3 --- .../advs-module/resources/lang/pt/setting.php | 11 ++++------- .../advs-module/resources/lang/ro/setting.php | 3 --- .../advs-module/resources/lang/ru/setting.php | 3 --- .../advs-module/resources/lang/sq/setting.php | 3 --- .../advs-module/resources/lang/sr/setting.php | 3 --- .../advs-module/resources/lang/sv/setting.php | 3 --- .../advs-module/resources/lang/tr/setting.php | 3 --- .../advs-module/resources/lang/uk/setting.php | 3 --- .../advs-module/resources/lang/ur/setting.php | 3 --- .../advs-module/resources/lang/vi/setting.php | 3 --- .../advs-module/resources/lang/zh/setting.php | 3 --- app/Exceptions/ExceptionHandler.php | 2 +- 41 files changed, 9 insertions(+), 119 deletions(-) diff --git a/.env_demo b/.env_demo index 1b50a89cc..4547c462b 100644 --- a/.env_demo +++ b/.env_demo @@ -64,4 +64,7 @@ ADV_WATERMARK_TYPE="text" ADV_WATERMARK_TEXT="openclassify.com" ADV_WATERMARK_POSITION="top-right" ADV_WATERMARK_OPACITY=80 -ADV_ENABLED_CURRENCIES='a:1:{i:0;s:3:"USD";}' \ No newline at end of file +ADV_ENABLED_CURRENCIES='a:1:{i:0;s:3:"USD";}' + + +ENABLE_SENTRY_LARAVEL=true diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index 247210f87..ba1dba8a1 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -17,7 +17,6 @@ return [ 'hide_price_categories', 'tcmb_exchange_url', 'enabled_currencies', - 'disable_sentry', 'hide_ad_cat', ], ], diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index 83a75233d..f41135af8 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -430,7 +430,6 @@ return [ 'default_value' => false, ] ], - 'disable_sentry' => 'anomaly.field_type.boolean', 'detailed_product_options' => [ 'type' => 'anomaly.field_type.boolean', 'config' => [ diff --git a/addons/default/visiosoft/advs-module/resources/lang/af/setting.php b/addons/default/visiosoft/advs-module/resources/lang/af/setting.php index b2c20052a..16d7765f7 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/af/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/af/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'KRY Kategorieë', 'instructions' => 'Dit verteenwoordig die kategorieë waarin die GET-eiendom geldig sal wees.' ], - 'disable_sentry' => [ - 'name' => 'Skakel wagwag uit' - ], 'watermark' => [ 'name' => 'Watermerk', 'instructions' => 'Is watermerk aktief?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php index d7f4a4acb..0b45ebff8 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'فئات GET', 'instructions' => 'إنه يمثل الفئات التي ستكون فيها خاصية GET صالحة.' ], - 'disable_sentry' => [ - 'name' => 'تعطيل الحارس' - ], 'watermark' => [ 'name' => 'علامة مائية', 'instructions' => 'هل العلامة المائية نشطة؟' diff --git a/addons/default/visiosoft/advs-module/resources/lang/az/setting.php b/addons/default/visiosoft/advs-module/resources/lang/az/setting.php index 9b869e941..7d5c66361 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/az/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/az/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'Kateqoriyalar alın', 'instructions' => 'GET mülkiyyətinin etibarlı olacağı kateqoriyanı təmsil edir.' ], - 'disable_sentry' => [ - 'name' => 'Nöqtəni deaktiv edin' - ], 'watermark' => [ 'name' => 'Filigran', 'instructions' => 'Filigran aktivdir?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/bg/setting.php b/addons/default/visiosoft/advs-module/resources/lang/bg/setting.php index d546186c4..d61d4acae 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/bg/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/bg/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'ВЗЕМЕТЕ Категории', 'instructions' => 'Той представлява категориите, в които свойството GET ще бъде валидно.' ], - 'disable_sentry' => [ - 'name' => 'Деактивирайте Sentry' - ], 'watermark' => [ 'name' => 'Воден знак', 'instructions' => 'Активен ли е водният знак?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/bn/setting.php b/addons/default/visiosoft/advs-module/resources/lang/bn/setting.php index 9de4e6bcb..c46e1c418 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/bn/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/bn/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET বিভাগসমূহ', 'instructions' => 'এটি এমন বিভাগগুলিতে প্রতিনিধিত্ব করে যেখানে জিইটি সম্পত্তি বৈধ হবে।' ], - 'disable_sentry' => [ - 'name' => 'সেন্ট্রি অক্ষম করুন' - ], 'watermark' => [ 'name' => 'ওয়াটারমার্ক', 'instructions' => 'জলছবি সক্রিয়?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ca/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ca/setting.php index 5a0f50463..f530e3fe5 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ca/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ca/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Categories', 'instructions' => 'Representa les categories en què la propietat GET serà vàlida.' ], - 'disable_sentry' => [ - 'name' => 'Desactiva Sentry' - ], 'watermark' => [ 'name' => 'Filigrana', 'instructions' => 'La filigrana està activa?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/cs/setting.php b/addons/default/visiosoft/advs-module/resources/lang/cs/setting.php index b95b40c6b..713cb661b 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/cs/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/cs/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'ZÍSKEJTE kategorie', 'instructions' => 'Představuje kategorie, ve kterých bude vlastnost GET platná.' ], - 'disable_sentry' => [ - 'name' => 'Zakázat Sentry' - ], 'watermark' => [ 'name' => 'Vodoznak', 'instructions' => 'Je vodoznak aktivní?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/da/setting.php b/addons/default/visiosoft/advs-module/resources/lang/da/setting.php index dde5daf0b..fbf77a8d9 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/da/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/da/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'FÅ kategorier', 'instructions' => 'Det repræsenterer de kategorier, hvor GET-ejendommen er gyldig.' ], - 'disable_sentry' => [ - 'name' => 'Deaktiver vagtpost' - ], 'watermark' => [ 'name' => 'Vandmærke', 'instructions' => 'Er vandmærke aktivt?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/de/setting.php b/addons/default/visiosoft/advs-module/resources/lang/de/setting.php index a4fdbd1fe..bea14cc54 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/de/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/de/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'Kategorien abrufen', 'instructions' => 'Es stellt die Kategorien dar, in denen die GET-Eigenschaft gültig ist.' ], - 'disable_sentry' => [ - 'name' => 'Sentry deaktivieren' - ], 'watermark' => [ 'name' => 'Wasserzeichen', 'instructions' => 'Ist das Wasserzeichen aktiv?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/el/setting.php b/addons/default/visiosoft/advs-module/resources/lang/el/setting.php index 743734f11..fa85e38a6 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/el/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/el/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Κατηγορίες', 'instructions' => 'Αντιπροσωπεύει τις κατηγορίες στις οποίες η ιδιότητα GET θα είναι έγκυρη.' ], - 'disable_sentry' => [ - 'name' => 'Απενεργοποιήστε το Sentry' - ], 'watermark' => [ 'name' => 'Στάθμη ύδατος', 'instructions' => 'Είναι ενεργό το υδατογράφημα;' diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index fbe003c58..4dbae9fc8 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Categories', 'instructions' => 'It represents the categories in which the GET property will be valid.' ], - 'disable_sentry' => [ - 'name' => 'Disable Sentry' - ], 'watermark' => [ 'name' => 'Watermark', 'instructions' => 'Is watermark active?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/es/setting.php b/addons/default/visiosoft/advs-module/resources/lang/es/setting.php index 3c7fa0e84..f0ef2bfc7 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/es/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/es/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'OBTENER Categorías', 'instructions' => 'Representa las categorías en las que será válida la propiedad GET.' ], - 'disable_sentry' => [ - 'name' => 'Desactivar centinela' - ], 'watermark' => [ 'name' => 'Filigrana', 'instructions' => '¿Está activa la marca de agua?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/fa/setting.php b/addons/default/visiosoft/advs-module/resources/lang/fa/setting.php index a3be0dd07..51edde546 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/fa/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/fa/setting.php @@ -255,9 +255,6 @@ return [ 'name' => 'دسته ها را دریافت کنید', 'instructions' => 'این نشان دهنده دسته هایی است که ویژگی GET در آنها معتبر خواهد بود.' ], - 'disable_sentry' => [ - 'name' => 'Sentry را غیرفعال کنید' - ], 'watermark' => [ 'name' => 'علامت', 'instructions' => 'آیا علامت علامت فعال است؟' diff --git a/addons/default/visiosoft/advs-module/resources/lang/fi/setting.php b/addons/default/visiosoft/advs-module/resources/lang/fi/setting.php index 05b3b83f2..7d0a6b3ac 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/fi/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/fi/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'HANKI luokkia', 'instructions' => 'Se edustaa luokkia, joissa GET-ominaisuus on voimassa.' ], - 'disable_sentry' => [ - 'name' => 'Poista Sentry käytöstä' - ], 'watermark' => [ 'name' => 'Vesileima', 'instructions' => 'Onko vesileima aktiivinen?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/fr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/fr/setting.php index 182c3102b..0a98a1d5f 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/fr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/fr/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'OBTENIR Catégories', 'instructions' => 'Il représente les catégories dans lesquelles la propriété GET sera valide.' ], - 'disable_sentry' => [ - 'name' => 'Désactiver Sentry' - ], 'watermark' => [ 'name' => 'Filigrane', 'instructions' => 'Le filigrane est-il actif?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/he/setting.php b/addons/default/visiosoft/advs-module/resources/lang/he/setting.php index 3920b36ee..1a545db4d 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/he/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/he/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'קבל קטגוריות', 'instructions' => 'הוא מייצג את הקטגוריות בהן נכס ה- GET יהיה תקף.' ], - 'disable_sentry' => [ - 'name' => 'השבת זקיף' - ], 'watermark' => [ 'name' => 'סימן מים', 'instructions' => 'האם סימן מים פעיל?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/hi/setting.php b/addons/default/visiosoft/advs-module/resources/lang/hi/setting.php index d18023319..47da41eec 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/hi/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/hi/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'श्रेणियाँ प्राप्त करें', 'instructions' => 'यह उन श्रेणियों का प्रतिनिधित्व करता है जिनमें GET संपत्ति मान्य होगी।' ], - 'disable_sentry' => [ - 'name' => 'संतरी अक्षम करें' - ], 'watermark' => [ 'name' => 'वाटर-मार्क', 'instructions' => 'क्या वॉटरमार्क सक्रिय है?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/hu/setting.php b/addons/default/visiosoft/advs-module/resources/lang/hu/setting.php index f98e4010e..eb5987587 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/hu/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/hu/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Kategóriák', 'instructions' => 'Azokat a kategóriákat képviseli, amelyekben a GET tulajdonság érvényes lesz.' ], - 'disable_sentry' => [ - 'name' => 'Letiltja a Sentry szolgáltatást' - ], 'watermark' => [ 'name' => 'Vízjel', 'instructions' => 'A vízjel aktív?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/id/setting.php b/addons/default/visiosoft/advs-module/resources/lang/id/setting.php index b1b6c4515..10fd546f3 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/id/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/id/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'DAPATKAN Kategori', 'instructions' => 'Ini mewakili kategori di mana properti GET akan berlaku.' ], - 'disable_sentry' => [ - 'name' => 'Nonaktifkan Sentry' - ], 'watermark' => [ 'name' => 'Tanda air', 'instructions' => 'Apakah watermark aktif?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/it/setting.php b/addons/default/visiosoft/advs-module/resources/lang/it/setting.php index eae73b60d..8ee3fbaae 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/it/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/it/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'OTTIENI Categorie', 'instructions' => 'Rappresenta le categorie in cui sarà valida la proprietà GET.' ], - 'disable_sentry' => [ - 'name' => 'Disabilita Sentry' - ], 'watermark' => [ 'name' => 'Filigrana', 'instructions' => 'La filigrana è attiva?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ja/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ja/setting.php index 3be54f676..d9ac1b1dd 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ja/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ja/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'カテゴリを取得', 'instructions' => 'これは、GETプロパティが有効になるカテゴリを表します。' ], - 'disable_sentry' => [ - 'name' => 'セントリーを無効にする' - ], 'watermark' => [ 'name' => '透かし', 'instructions' => '透かしはアクティブですか？' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ko/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ko/setting.php index 7b374adbc..c8ce6ca2b 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ko/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ko/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET 카테고리', 'instructions' => 'GET 속성이 유효한 범주를 나타냅니다.' ], - 'disable_sentry' => [ - 'name' => '센트리 비활성화' - ], 'watermark' => [ 'name' => '양수표', 'instructions' => '워터 마크가 활성화되어 있습니까?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ku/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ku/setting.php index 0334cbebe..94f1e18d2 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ku/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ku/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'Kategoriyan bistînin', 'instructions' => 'Ew kategoriyên ku tê de taybetmendiya GET dê derbasdar be temsîl dike.' ], - 'disable_sentry' => [ - 'name' => 'Sentry Disable' - ], 'watermark' => [ 'name' => 'Watermark', 'instructions' => 'Watermark çalak e?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php b/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php index ef02292c1..bedabb8a2 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/nl/setting.php @@ -254,9 +254,6 @@ zullen niet zichtbaar zijn en ontzegt u van het bedrijfslidmaatschap.' 'name' => 'GET Categorieën', 'instructions' => 'Het vertegenwoordigt de categorieën waarin de eigenschap GET geldig zal zijn.' ], - 'disable_sentry' => [ - 'name' => 'Schakel Sentry uit' - ], 'watermark' => [ 'name' => 'Watermerk', 'instructions' => 'Is watermerk actief?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/no/setting.php b/addons/default/visiosoft/advs-module/resources/lang/no/setting.php index 7b1433d14..49142f7c8 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/no/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/no/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'FÅ kategorier', 'instructions' => 'Den representerer kategoriene der GET-egenskapen vil være gyldig.' ], - 'disable_sentry' => [ - 'name' => 'Deaktiver vaktpost' - ], 'watermark' => [ 'name' => 'Vannmerke', 'instructions' => 'Er vannmerke aktivt?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/pl/setting.php b/addons/default/visiosoft/advs-module/resources/lang/pl/setting.php index cc779c6d0..c6ec6dc98 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/pl/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/pl/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'POBIERZ kategorie', 'instructions' => 'Reprezentuje kategorie, w których właściwość GET będzie ważna.' ], - 'disable_sentry' => [ - 'name' => 'Wyłącz Sentry' - ], 'watermark' => [ 'name' => 'znak wodny', 'instructions' => 'Czy znak wodny jest aktywny?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/pt/setting.php b/addons/default/visiosoft/advs-module/resources/lang/pt/setting.php index 97075911a..c79253323 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/pt/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/pt/setting.php @@ -192,16 +192,16 @@ return [ 'name' => 'Altura da tela da imagem', ], 'watermark_type' => [ - 'name' => 'Tipo de marca d\\'água', + 'name' => 'Tipo de marca d\'água', ], 'watermark_text' => [ - 'name' => 'Texto de marca d\\'água', + 'name' => 'Texto de marca d\'água', ], 'watermark_image' => [ - 'name' => 'Imagem de marca d\\'água', + 'name' => 'Imagem de marca d\'água', ], 'watermark_position' => [ - 'name' => 'Posição da marca d\\'água', + 'name' => 'Posição da marca d\'água', ], 'user_filter_limit' => [ 'name' => 'Limite de filtro de usuário', @@ -254,9 +254,6 @@ return [ 'name' => 'GET Categorias', 'instructions' => 'Representa as categorias nas quais a propriedade GET será válida.' ], - 'disable_sentry' => [ - 'name' => 'Desativar Sentinela' - ], 'watermark' => [ 'name' => 'Marca d\'água', 'instructions' => 'A marca d\'água está ativa?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ro/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ro/setting.php index ac1f8574e..e60e1954a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ro/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ro/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Categorii', 'instructions' => 'Reprezintă categoriile în care proprietatea GET va fi validă.' ], - 'disable_sentry' => [ - 'name' => 'Dezactivați Sentinela' - ], 'watermark' => [ 'name' => 'Filigran', 'instructions' => 'Filigranul este activ?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ru/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ru/setting.php index 58a39e4fa..73a3bccb4 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ru/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ru/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'Получить Категории', 'instructions' => 'Он представляет категории, в которых будет действовать свойство GET.' ], - 'disable_sentry' => [ - 'name' => 'Отключить Sentry' - ], 'watermark' => [ 'name' => 'Водяной знак', 'instructions' => 'Водяной знак активен?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php b/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php index da23d63f6..e08fac988 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Kategoritë', 'instructions' => 'Ai përfaqëson kategoritë në të cilat prona GET do të jetë e vlefshme.' ], - 'disable_sentry' => [ - 'name' => 'Çaktivizo rojet' - ], 'watermark' => [ 'name' => 'Filigranë', 'instructions' => 'A është ujëra aktive?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/sr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/sr/setting.php index f7af8bfa6..9c521afa3 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sr/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Kategorije', 'instructions' => 'Predstavlja kategorije u kojima će GET svojstvo biti važeće.' ], - 'disable_sentry' => [ - 'name' => 'Isključite Sentry' - ], 'watermark' => [ 'name' => 'Vodeni žig', 'instructions' => 'Da li je aktivan vodeni žig?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/sv/setting.php b/addons/default/visiosoft/advs-module/resources/lang/sv/setting.php index 31ef27793..9b38b2380 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sv/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sv/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'Hämta kategorier', 'instructions' => 'Det representerar de kategorier i vilka GET-egenskapen är giltig.' ], - 'disable_sentry' => [ - 'name' => 'Inaktivera vaktpost' - ], 'watermark' => [ 'name' => 'Vattenstämpel', 'instructions' => 'Är vattenstämpel aktivt?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php index 48dd987bd..2d6724837 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'GET Kategorileri', 'instructions' => 'GET özelliğinin geçerli olacağı kategorileri temsil eder.' ], - 'disable_sentry' => [ - 'name' => 'Sentry\'yi devre dışı bırak' - ], 'watermark' => [ 'name' => 'Filigran', 'instructions' => 'Filigran etkin mi?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/uk/setting.php b/addons/default/visiosoft/advs-module/resources/lang/uk/setting.php index a26eb9a65..3939d0653 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/uk/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/uk/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'ОТРИМАТИ Категорії', 'instructions' => 'Він представляє категорії, в яких буде дійсним властивість GET.' ], - 'disable_sentry' => [ - 'name' => 'Вимкнути Sentry' - ], 'watermark' => [ 'name' => 'Водяний знак', 'instructions' => 'Активний водяний знак?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/ur/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ur/setting.php index 1787691aa..5862c2ce9 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ur/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ur/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'زمرہ جات حاصل کریں', 'instructions' => 'یہ ان زمروں کی نمائندگی کرتا ہے جن میں جی ای ٹی پراپرٹی درست ہوگی۔' ], - 'disable_sentry' => [ - 'name' => 'سینٹری کو غیر فعال کریں' - ], 'watermark' => [ 'name' => 'واٹر مارک', 'instructions' => 'کیا واٹر مارک سرگرم ہے؟' diff --git a/addons/default/visiosoft/advs-module/resources/lang/vi/setting.php b/addons/default/visiosoft/advs-module/resources/lang/vi/setting.php index dd9b1b4ae..5efd56222 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/vi/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/vi/setting.php @@ -254,9 +254,6 @@ return [ 'name' => 'NHẬN danh mục', 'instructions' => 'Nó đại diện cho các danh mục mà thuộc tính GET sẽ hợp lệ.' ], - 'disable_sentry' => [ - 'name' => 'Tắt Sentry' - ], 'watermark' => [ 'name' => 'Chữ ký ảnh', 'instructions' => 'Hình mờ có hoạt động không?' diff --git a/addons/default/visiosoft/advs-module/resources/lang/zh/setting.php b/addons/default/visiosoft/advs-module/resources/lang/zh/setting.php index cd08c5c6f..6a449e90b 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/zh/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/zh/setting.php @@ -254,9 +254,6 @@ return [ 'name' => '获取类别', 'instructions' => '它代表GET属性将在其中有效的类别。' ], - 'disable_sentry' => [ - 'name' => '禁用哨兵' - ], 'watermark' => [ 'name' => '水印', 'instructions' => '水印活跃吗？' diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index 898f1e84b..83b60ec9c 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -75,7 +75,7 @@ class ExceptionHandler extends Handler if (app()->bound('sentry') && $this->shouldReport($e) && env('SENTRY_LARAVEL_DSN')) { - if (!setting_value('visiosoft.module.advs::disable_sentry')) { + if (env('ENABLE_SENTRY_LARAVEL',true)) { app('sentry')->captureException($e); } } From 7d9088be71e5162a3c4d5e13cd29d1385187abbe Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 19 Jul 2021 16:23:22 +0300 Subject: [PATCH 2/3] fixed cors --- composer.json | 3 ++- config/app.php | 1 + config/cors.php | 14 ++++++++------ config/streams.php | 4 +++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index e7cb719fc..a3a892de4 100644 --- a/composer.json +++ b/composer.json @@ -84,7 +84,8 @@ "pusher/pusher-php-server": "^5.0", "simplepie/simplepie": "^1.5.0", "guzzlehttp/guzzle": "^7.3", - "visiosoft/connect-module": "^1.0" + "visiosoft/connect-module": "^1.0", + "fruitcake/laravel-cors": "^2.0" }, "replace": { "anomaly/streams-platform": "*" diff --git a/config/app.php b/config/app.php index 669168482..18cb9f7ad 100644 --- a/config/app.php +++ b/config/app.php @@ -213,6 +213,7 @@ return [ */ Anomaly\Streams\Platform\StreamsServiceProvider::class, Sentry\Laravel\ServiceProvider::class, + \Fruitcake\Cors\CorsServiceProvider::class ], diff --git a/config/cors.php b/config/cors.php index 598b61a86..684f5e8aa 100644 --- a/config/cors.php +++ b/config/cors.php @@ -12,11 +12,13 @@ return [ | */ - 'supportsCredentials' => false, - 'allowedOrigins' => ['*'],// ex: ['abc.com', 'api.abc.com'] - 'allowedHeaders' => ['*'], - 'allowedMethods' => ['*'],// ex: ['GET', 'POST', 'PUT', 'DELETE'] - 'exposedHeaders' => [], - 'maxAge' => 0, + 'paths' => ['*'], + 'allowed_methods' => ['*'], + 'allowed_origins' => ['*'], + 'allowed_origins_patterns' => [], + 'allowed_headers' => ['*'], + 'exposed_headers' => false, + 'max_age' => false, + 'supports_credentials' => false, ]; \ No newline at end of file diff --git a/config/streams.php b/config/streams.php index 7add737bb..56fdcff0e 100644 --- a/config/streams.php +++ b/config/streams.php @@ -90,7 +90,9 @@ return [ | */ - 'middleware' => [], + 'middleware' => [ + \Fruitcake\Cors\HandleCors::class, # this line + ], /* |-------------------------------------------------------------------------- From ae429632fc0b74ace82245eac4fa09f2ea9f5dcc Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 28 Jul 2021 10:01:47 +0300 Subject: [PATCH 3/3] added sentry config --- app/Exceptions/ExceptionHandler.php | 2 +- config/sentry.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index 83b60ec9c..568b8a798 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -75,7 +75,7 @@ class ExceptionHandler extends Handler if (app()->bound('sentry') && $this->shouldReport($e) && env('SENTRY_LARAVEL_DSN')) { - if (env('ENABLE_SENTRY_LARAVEL',true)) { + if (config('sentry.enable_sentry_laravel')) { app('sentry')->captureException($e); } } diff --git a/config/sentry.php b/config/sentry.php index bd95322af..52cabdb04 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -33,4 +33,5 @@ return [ 'controllers_base_namespace' => env('SENTRY_CONTROLLERS_BASE_NAMESPACE', 'App\\Http\\Controllers'), + 'enable_sentry_laravel' => env('ENABLE_SENTRY_LARAVEL',true), ];