diff --git a/application/config/migration.php b/application/config/migration.php index b2d763b4..f98b1f39 100755 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -21,7 +21,7 @@ $config['migration_enabled'] = TRUE; | be upgraded / downgraded to. | */ -$config['migration_version'] = 21; +$config['migration_version'] = 22; /* diff --git a/application/controllers/Appointments.php b/application/controllers/Appointments.php index 296d3e80..b3be8488 100755 --- a/application/controllers/Appointments.php +++ b/application/controllers/Appointments.php @@ -66,6 +66,11 @@ class Appointments extends EA_Controller { $time_format = $this->settings_model->get_setting('time_format'); $first_weekday = $this->settings_model->get_setting('first_weekday'); $require_phone_number = $this->settings_model->get_setting('require_phone_number'); + $show_field['phone-number'] = $this->settings_model->get_setting('show_phone_number'); + $show_field['address'] = $this->settings_model->get_setting('show_address'); + $show_field['city'] = $this->settings_model->get_setting('show_city'); + $show_field['zip-code'] = $this->settings_model->get_setting('show_zip_code'); + $show_field['notes'] = $this->settings_model->get_setting('show_notes'); $display_cookie_notice = $this->settings_model->get_setting('display_cookie_notice'); $cookie_notice_content = $this->settings_model->get_setting('cookie_notice_content'); $display_terms_and_conditions = $this->settings_model->get_setting('display_terms_and_conditions'); @@ -163,6 +168,7 @@ class Appointments extends EA_Controller { 'time_format' => $time_format, 'first_weekday' => $first_weekday, 'require_phone_number' => $require_phone_number, + 'show_field' => $show_field, 'appointment_data' => $appointment, 'provider_data' => $provider, 'customer_data' => $customer, @@ -442,6 +448,12 @@ class Appointments extends EA_Controller { $appointment = $post_data['appointment']; $customer = $post_data['customer']; + if (!array_key_exists('address', $customer)){ $customer['address'] = ""; } + if (!array_key_exists('city', $customer)){ $customer['city'] = ""; } + if (!array_key_exists('zip_code', $customer)){ $customer['zip_code'] = ""; } + if (!array_key_exists('notes', $customer)){ $customer['notes'] = ""; } + if (!array_key_exists('phone_number', $customer)){ $customer['address'] = ""; } + // Check appointment availability before registering it to the database. $appointment['id_users_provider'] = $this->check_datetime_availability(); diff --git a/application/controllers/Backend_api.php b/application/controllers/Backend_api.php index e562e19c..4a188199 100755 --- a/application/controllers/Backend_api.php +++ b/application/controllers/Backend_api.php @@ -1355,6 +1355,24 @@ class Backend_api extends EA_Controller { $settings = json_decode($this->input->post('settings', FALSE), TRUE); + //check if phone number settings are valid + $phone_number_required = false; + $phone_number_shown = false; + foreach ($settings as $setting) + { + if ($setting['name'] == "require_phone_number"){ + $phone_number_required = $setting['value']; + } + + if ($setting['name'] == "show_phone_number"){ + $phone_number_shown = $setting['value']; + } + } + + if ($phone_number_required && !$phone_number_shown){//we have settings that break the appointments field. + throw new Exception("You cannot hide the phone number in the booking form while it's also required!"); + } + $this->settings_model->save_settings($settings); } else diff --git a/application/language/arabic/translations_lang.php b/application/language/arabic/translations_lang.php index b4b219f2..243c3d83 100755 --- a/application/language/arabic/translations_lang.php +++ b/application/language/arabic/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'الموقع الالكتروني للشركة ي $lang['go_to_booking_page'] = 'الذهاب الى صفحة الحجوزات'; $lang['settings_saved'] = 'تم حفظ الاعدادات بنجاح'; $lang['general'] = 'عام'; +$lang['client_form'] = 'نموذج العميل'; +$lang['visible'] = 'مرئي'; +$lang['hidden'] = 'مختفي'; $lang['business_logic'] = 'منطق الأعمال'; $lang['current_user'] = 'المستخدم الحالي'; $lang['about_app'] = 'About E!A'; diff --git a/application/language/bulgarian/translations_lang.php b/application/language/bulgarian/translations_lang.php index 4552cde4..53102a10 100755 --- a/application/language/bulgarian/translations_lang.php +++ b/application/language/bulgarian/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Препратката на организация $lang['go_to_booking_page'] = 'Към страница за запазване.'; $lang['settings_saved'] = 'Настройките записани успешно.'; $lang['general'] = 'Общи'; +$lang['client_form'] = 'Клиентска форма'; +$lang['visible'] = 'видим'; +$lang['hidden'] = 'Скрит'; $lang['business_logic'] = 'Бизнес логика'; $lang['current_user'] = 'Текущ потребител'; $lang['about_app'] = 'Относно'; diff --git a/application/language/catalan/translations_lang.php b/application/language/catalan/translations_lang.php index 9cc85f0f..ba750273 100644 --- a/application/language/catalan/translations_lang.php +++ b/application/language/catalan/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'L\'enllaç a l\'organització hauria d\'enllaçar $lang['go_to_booking_page'] = 'Ves a la pàgina de reserves'; $lang['settings_saved'] = 'Les configuracions s\'han desat correctament.'; $lang['general'] = 'General'; +$lang['client_form'] = 'Formulari del client'; +$lang['visible'] = 'Visible'; +$lang['hidden'] = 'Amagat'; $lang['business_logic'] = 'Lògica de negoci'; $lang['current_user'] = 'Usuari actual'; $lang['about_app'] = 'Quant a Easy!Appointments'; diff --git a/application/language/chinese/translations_lang.php b/application/language/chinese/translations_lang.php index b7c1b1f6..4dc1e317 100755 --- a/application/language/chinese/translations_lang.php +++ b/application/language/chinese/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = '公司的网址应当指向公司的官方网页 ( $lang['go_to_booking_page'] = '进入预约页面'; $lang['settings_saved'] = '设置成功保存.'; $lang['general'] = '一般设置'; +$lang['client_form'] = '客户形态'; +$lang['visible'] = '可见的'; +$lang['hidden'] = '隐'; $lang['business_logic'] = '工作时间'; $lang['current_user'] = '目前登录用户'; $lang['about_app'] = '关于网上预约系统'; diff --git a/application/language/czech/translations_lang.php b/application/language/czech/translations_lang.php index e8301899..e217e734 100644 --- a/application/language/czech/translations_lang.php +++ b/application/language/czech/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Odkaz na web společnosti by měl vést na oficál $lang['go_to_booking_page'] = 'Přejít na stránku rezervací'; $lang['settings_saved'] = 'Nastavení úspěšně uložena.'; $lang['general'] = 'Obecné'; +$lang['client_form'] = 'Formulář klienta'; +$lang['visible'] = 'Viditelný'; +$lang['hidden'] = 'Skrytý'; $lang['business_logic'] = 'Business logika'; $lang['current_user'] = 'Přihlášený uživatel'; $lang['about_app'] = 'O aplikaci Easy!Appointments'; diff --git a/application/language/danish/translations_lang.php b/application/language/danish/translations_lang.php index b787e7a3..9c939670 100755 --- a/application/language/danish/translations_lang.php +++ b/application/language/danish/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Firma linket skal gå ind på den officielle websi $lang['go_to_booking_page'] = 'Gå til booking siden'; $lang['settings_saved'] = 'Indstillingerne er gemt'; $lang['general'] = 'Generelt'; +$lang['client_form'] = 'Klientform'; +$lang['visible'] = 'Synlig'; +$lang['hidden'] = 'Skjult'; $lang['business_logic'] = 'Forretningslogik'; $lang['current_user'] = 'Nuværende bruger'; $lang['about_app'] = 'Om Easy!Appointments'; diff --git a/application/language/dutch/translations_lang.php b/application/language/dutch/translations_lang.php index 1edca266..08dbd147 100755 --- a/application/language/dutch/translations_lang.php +++ b/application/language/dutch/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'De link naar het bedrijf moet verwijzen naar de of $lang['go_to_booking_page'] = 'Ga naar de boekingspagina'; $lang['settings_saved'] = 'Instellingen succesvol opgeslagen.'; $lang['general'] = 'Algemeen'; +$lang['client_form'] = 'Klantformulier'; +$lang['visible'] = 'Zichtbaar'; +$lang['hidden'] = 'Verborgen'; $lang['business_logic'] = 'Bedrijfsinstellingen'; $lang['current_user'] = 'Huidige gebruiker'; $lang['about_app'] = 'Over Easy!Appointments'; diff --git a/application/language/english/translations_lang.php b/application/language/english/translations_lang.php index a9aadce4..5000678f 100755 --- a/application/language/english/translations_lang.php +++ b/application/language/english/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Company link should point to the official website $lang['go_to_booking_page'] = 'Go To Booking Page'; $lang['settings_saved'] = 'Settings saved successfully.'; $lang['general'] = 'General'; +$lang['client_form'] = 'Client Form'; +$lang['visible'] = 'Visible'; +$lang['hidden'] = 'Hidden'; $lang['business_logic'] = 'Business Logic'; $lang['current_user'] = 'Current User'; $lang['about_app'] = 'About Easy!Appointments'; diff --git a/application/language/finnish/translations_lang.php b/application/language/finnish/translations_lang.php index ef93b881..c3c1478f 100755 --- a/application/language/finnish/translations_lang.php +++ b/application/language/finnish/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Kotisivulinkin tulisi ohjata yrityksen kotisivuill $lang['go_to_booking_page'] = 'Palaa ajanvaraussivulle'; $lang['settings_saved'] = 'Asetukset tallennettiin onnistuneesti.'; $lang['general'] = 'Yleinen'; +$lang['client_form'] = 'Asiakaslomake'; +$lang['visible'] = 'Näkyvä'; +$lang['hidden'] = 'Piilotettu'; $lang['business_logic'] = 'Työajat'; $lang['current_user'] = 'Nykyinen käyttäjä'; $lang['about_app'] = 'Tietoja Easy!Appointments:sta'; diff --git a/application/language/french/translations_lang.php b/application/language/french/translations_lang.php index 34b0ae5c..178dbd08 100755 --- a/application/language/french/translations_lang.php +++ b/application/language/french/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Le lien de la société doit pointer vers le site $lang['go_to_booking_page'] = 'Aller à la page de rendez-vous'; $lang['settings_saved'] = 'Paramètres sauvegardés avec succès.'; $lang['general'] = 'Général'; +$lang['client_form'] = 'Formulaire de clientèle'; +$lang['visible'] = 'Visible'; +$lang['hidden'] = 'Caché'; $lang['business_logic'] = 'Logique commerciale'; $lang['current_user'] = 'Utilisateur actuel'; $lang['about_app'] = 'Au sujet d\'Easy!Appointments'; diff --git a/application/language/german/translations_lang.php b/application/language/german/translations_lang.php index d6e4db9a..e4764461 100755 --- a/application/language/german/translations_lang.php +++ b/application/language/german/translations_lang.php @@ -166,6 +166,9 @@ $lang['company_link_hint'] = 'Der Firmen-Link sollte auf die offizielle Webseite $lang['go_to_booking_page'] = 'Weiter zur Buchungsseite'; $lang['settings_saved'] = 'Einstellungen erfolgreich gesichert.'; $lang['general'] = 'Allgemeines'; +$lang['client_form'] = 'Kundenformular'; +$lang['visible'] = 'Sichtbar'; +$lang['hidden'] = 'Versteckt'; $lang['business_logic'] = 'Unternehmerische Logik'; $lang['current_user'] = 'Aktueller Nutzer'; $lang['about_app'] = 'Über Easy!Appointments'; diff --git a/application/language/greek/translations_lang.php b/application/language/greek/translations_lang.php index 8477b3da..95f339b9 100755 --- a/application/language/greek/translations_lang.php +++ b/application/language/greek/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Ο σύνδεσμος εταιρείας θα πρ $lang['go_to_booking_page'] = 'Πλοήγηση Στην Σελίδα Κράτησης'; $lang['settings_saved'] = 'Οι ρυθμίσεις αποθηκεύτηκαν επιτυχώς.'; $lang['general'] = 'Γενικά'; +$lang['client_form'] = 'Μορφή πελάτη'; +$lang['visible'] = 'Ορατός'; +$lang['hidden'] = 'Κρυμμένος'; $lang['business_logic'] = 'Επιχειρηματική Λογική'; $lang['current_user'] = 'Τρέχων Χρήστης'; $lang['about_app'] = 'Σχετικά με το Easy!Appointments'; diff --git a/application/language/hebrew/translations_lang.php b/application/language/hebrew/translations_lang.php index b7d6eba7..6d3181eb 100644 --- a/application/language/hebrew/translations_lang.php +++ b/application/language/hebrew/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'קישור החברה צריך לקשר לאתר $lang['go_to_booking_page'] = 'עבור לדף ההזמנות'; $lang['settings_saved'] = 'ההגדרות נשמרו בהצלחה!'; $lang['general'] = 'כללי'; +$lang['client_form'] = 'טופס הלקוח'; +$lang['visible'] = 'גלוי'; +$lang['hidden'] = 'מוּסתָר'; $lang['business_logic'] = 'לוגיקה עסקית'; $lang['current_user'] = 'משתמש נוכחי'; $lang['about_app'] = 'אודות Easy!Appointments'; diff --git a/application/language/hindi/translations_lang.php b/application/language/hindi/translations_lang.php index e276dffb..a1574938 100755 --- a/application/language/hindi/translations_lang.php +++ b/application/language/hindi/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'कंपनी की लिंक कंपन $lang['go_to_booking_page'] = 'आरक्षण का पेज पर जाएं'; $lang['settings_saved'] = 'सेटिंग सफलतापूर्वक सेव.'; $lang['general'] = 'सामान्य'; +$lang['client_form'] = 'क्लाइंट फॉर्म'; +$lang['visible'] = 'दर्शनीय'; +$lang['hidden'] = 'छिपा हुआ'; $lang['business_logic'] = 'व्यापार का तर्क'; $lang['current_user'] = 'तात्कालिक प्रयोगकर्ता'; $lang['about_app'] = 'ई ए के बारे में'; diff --git a/application/language/hungarian/translations_lang.php b/application/language/hungarian/translations_lang.php index 44755b30..2a75c9f2 100755 --- a/application/language/hungarian/translations_lang.php +++ b/application/language/hungarian/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'A vállalkozás linkje a cég hivatalos weblapjár $lang['go_to_booking_page'] = 'Ugrás a foglalási oldalra'; $lang['settings_saved'] = 'Beállítások sikeresen mentve.'; $lang['general'] = 'Általános'; +$lang['client_form'] = 'Ügyfélforma'; +$lang['visible'] = 'Látható'; +$lang['hidden'] = 'Rejtett'; $lang['business_logic'] = 'Business Logic'; $lang['current_user'] = 'Jelenlegi felhasználó'; $lang['about_app'] = 'Easy!Appointments-ról'; diff --git a/application/language/italian/translations_lang.php b/application/language/italian/translations_lang.php index 201ad7b5..8b1bf680 100755 --- a/application/language/italian/translations_lang.php +++ b/application/language/italian/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Il link aziendale dovrebbe puntare al sito ufficia $lang['go_to_booking_page'] = 'Vai alla pagina delle prenotazioni'; $lang['settings_saved'] = 'Impostazioni salvate con successo.'; $lang['general'] = 'Generale'; +$lang['client_form'] = 'Forma del cliente'; +$lang['visible'] = 'Visible'; +$lang['hidden'] = 'Nascosto'; $lang['business_logic'] = 'Business Logic'; $lang['current_user'] = 'Utente corrente'; $lang['about_app'] = 'Info su Easy!Appointments'; diff --git a/application/language/japanese/translations_lang.php b/application/language/japanese/translations_lang.php index 1133ae68..1466080d 100755 --- a/application/language/japanese/translations_lang.php +++ b/application/language/japanese/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = '会社のウェブサイトへのリンクを設 $lang['go_to_booking_page'] = '予約ページへ'; $lang['settings_saved'] = '設定は保存されました。'; $lang['general'] = '一般'; +$lang['client_form'] = 'お客様のフォーム'; +$lang['visible'] = '目に見える'; +$lang['hidden'] = '目に見えません'; $lang['business_logic'] = '勤務時間設定'; $lang['current_user'] = '現在のユーザー'; $lang['about_app'] = 'Easy!Appointmentsとは。'; diff --git a/application/language/luxembourgish/translations_lang.php b/application/language/luxembourgish/translations_lang.php index 7b8001d0..80739c11 100755 --- a/application/language/luxembourgish/translations_lang.php +++ b/application/language/luxembourgish/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'De Firmelink sollt op déi offiziell Websäit vun $lang['go_to_booking_page'] = 'Gitt op d\'Buchungssäit'; $lang['settings_saved'] = 'Astellungen erfollegräich gespäichert.'; $lang['general'] = 'Allgemenges'; +$lang['client_form'] = 'Client Form'; +$lang['visible'] = 'Fir siichtbar'; +$lang['hidden'] = 'Verstoppen'; $lang['business_logic'] = 'Business Logik'; $lang['current_user'] = 'Ugemellte Benotzer'; $lang['about_app'] = 'Iwwert Easy!Appointments'; diff --git a/application/language/marathi/translations_lang.php b/application/language/marathi/translations_lang.php index 46a92007..63f4d614 100644 --- a/application/language/marathi/translations_lang.php +++ b/application/language/marathi/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'कंपनी दुव्याने कंप $lang['go_to_booking_page'] = 'आरक्षण पृष्ठावर जा'; $lang['settings_saved'] = 'सेव्ह यशस्वीरित्या सेट करीत आहे.'; $lang['general'] = 'सामान्य'; +$lang['client_form'] = 'क्लायंट फॉर्म'; +$lang['visible'] = 'दृश्यमान'; +$lang['hidden'] = 'लपलेले'; $lang['business_logic'] = 'व्यवसाय तर्कशास्त्र'; $lang['current_user'] = 'तात्कालिक प्रयोगकर्ता'; $lang['about_app'] = 'अ‍ॅप बद्दल...'; diff --git a/application/language/persian/translations_lang.php b/application/language/persian/translations_lang.php index 6bdf1665..a1477f2d 100644 --- a/application/language/persian/translations_lang.php +++ b/application/language/persian/translations_lang.php @@ -169,6 +169,9 @@ $lang['company_link_hint'] = 'لینک شرکت باید حاوی آدرس وب $lang['go_to_booking_page'] = 'برو به صفحه ثبت ملاقات'; $lang['settings_saved'] = 'تنظیمات با موفقیت ذخیره شد'; $lang['general'] = 'عمومی'; +$lang['client_form'] = 'فرم مشتری'; +$lang['visible'] = 'قابل رویت'; +$lang['hidden'] = 'پنهان'; $lang['business_logic'] = 'منطق تجارت'; $lang['current_user'] = 'کاربر جاری'; $lang['about_app'] = 'درباره Easy!Appointments'; diff --git a/application/language/polish/translations_lang.php b/application/language/polish/translations_lang.php index f5a77026..83e266c9 100755 --- a/application/language/polish/translations_lang.php +++ b/application/language/polish/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Link firmowy powinien wskazywać na firmowe www. ( $lang['go_to_booking_page'] = 'Idź do strony bookowania'; $lang['settings_saved'] = 'Ustawienia zapisano.'; $lang['general'] = 'Ogólne'; +$lang['client_form'] = 'Formularz klienta'; +$lang['visible'] = 'Widoczny'; +$lang['hidden'] = 'Ukryty'; $lang['business_logic'] = 'Podział Firmy'; $lang['current_user'] = 'Bieżący Użytkownik'; $lang['about_app'] = 'O Easy!Appointments'; diff --git a/application/language/portuguese-br/translations_lang.php b/application/language/portuguese-br/translations_lang.php index 14cc3329..c63a3fe8 100755 --- a/application/language/portuguese-br/translations_lang.php +++ b/application/language/portuguese-br/translations_lang.php @@ -169,6 +169,9 @@ $lang['company_link_hint'] = 'Endereço da empresa deve apontar para o site ofic $lang['go_to_booking_page'] = 'Ir para a página de reserva'; $lang['settings_saved'] = 'Definições salvas com sucesso.'; $lang['general'] = 'Geral'; +$lang['client_form'] = 'Forma de cliente'; +$lang['visible'] = 'Visível'; +$lang['hidden'] = 'Escondido'; $lang['business_logic'] = 'Lógica de negócio'; $lang['current_user'] = 'Usuário Atual'; $lang['about_app'] = 'Sobre o Easy!Appointments'; diff --git a/application/language/portuguese/translations_lang.php b/application/language/portuguese/translations_lang.php index 2306ffd3..065f0c4d 100755 --- a/application/language/portuguese/translations_lang.php +++ b/application/language/portuguese/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Endereço da empresa deve apontar para o site ofic $lang['go_to_booking_page'] = 'Ir para a página de reserva'; $lang['settings_saved'] = 'Definições guardadas com sucesso.'; $lang['general'] = 'Geral'; +$lang['client_form'] = 'Forma de cliente'; +$lang['visible'] = 'Visível'; +$lang['hidden'] = 'Escondido'; $lang['business_logic'] = 'Lógica de negócio'; $lang['current_user'] = 'Utilizador Actual'; $lang['about_app'] = 'Sobre o Easy!Appointments'; diff --git a/application/language/romanian/translations_lang.php b/application/language/romanian/translations_lang.php index 30dd3160..e81dc407 100755 --- a/application/language/romanian/translations_lang.php +++ b/application/language/romanian/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Linkul trebuie sa indice website-ul oficial al com $lang['go_to_booking_page'] = 'La pagina de înregistrari'; $lang['settings_saved'] = 'Setari salvate.'; $lang['general'] = 'General'; +$lang['client_form'] = 'Client Formular'; +$lang['visible'] = 'Vizibil'; +$lang['hidden'] = 'Ascuns'; $lang['business_logic'] = 'Logica afacerii'; $lang['current_user'] = 'Utilizator curent'; $lang['about_app'] = 'Despre Easy!Appointments'; diff --git a/application/language/russian/translations_lang.php b/application/language/russian/translations_lang.php index 790e3d37..ff256f4b 100755 --- a/application/language/russian/translations_lang.php +++ b/application/language/russian/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Сайт компании должен указы $lang['go_to_booking_page'] = 'Перейти на страницу заказов'; $lang['settings_saved'] = 'Настройки сохранены.'; $lang['general'] = 'Основные'; +$lang['client_form'] = 'Форма клиента'; +$lang['visible'] = 'Видимый'; +$lang['hidden'] = 'Скрытый'; $lang['business_logic'] = 'Бизнес-логика'; $lang['current_user'] = 'Текущий пользователь'; $lang['about_app'] = 'О приложении Easy!Appointments'; diff --git a/application/language/slovak/translations_lang.php b/application/language/slovak/translations_lang.php index 2102d2a2..570d311e 100755 --- a/application/language/slovak/translations_lang.php +++ b/application/language/slovak/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Link firmy by mal odkazovať na oficiálnu stránk $lang['go_to_booking_page'] = 'Prejsť na stránku rezervácií'; $lang['settings_saved'] = 'Nastavenie úspešne uložené.'; $lang['general'] = 'Všeobecný'; +$lang['client_form'] = 'Tvar klienta'; +$lang['visible'] = 'Viditeľný'; +$lang['hidden'] = 'Skrytý'; $lang['business_logic'] = 'Firemné údaje'; $lang['current_user'] = 'Prihlásený užívateľ'; $lang['about_app'] = 'O Easy!Appointments'; diff --git a/application/language/spanish/translations_lang.php b/application/language/spanish/translations_lang.php index 5708d8c4..360024d5 100755 --- a/application/language/spanish/translations_lang.php +++ b/application/language/spanish/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'El enlace de la empresa debe dirigir al sitio web $lang['go_to_booking_page'] = 'Ir a la página para agendar'; $lang['settings_saved'] = 'Configuración guardada exitosamente'; $lang['general'] = 'General'; +$lang['client_form'] = 'Formulario del cliente'; +$lang['visible'] = 'Visible'; +$lang['hidden'] = 'Oculto'; $lang['business_logic'] = 'Lógica del negocio'; $lang['current_user'] = 'Usuario actual'; $lang['about_app'] = 'Acerca de Easy!Appointments'; diff --git a/application/language/swedish/translations_lang.php b/application/language/swedish/translations_lang.php index 2e69c0ef..b8577bdb 100644 --- a/application/language/swedish/translations_lang.php +++ b/application/language/swedish/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Länk till företagets hemsida. (obligatorisk)'; $lang['go_to_booking_page'] = 'Gå till bokningssidan.'; $lang['settings_saved'] = 'Inställningarna är sparade.'; $lang['general'] = 'Generellt'; +$lang['client_form'] = 'Klientform'; +$lang['visible'] = 'Synlig'; +$lang['hidden'] = 'Dold'; $lang['business_logic'] = 'Affärsregler'; $lang['current_user'] = 'Nuvarande användare'; $lang['about_app'] = 'Om Easy!Appointments'; diff --git a/application/language/turkish/translations_lang.php b/application/language/turkish/translations_lang.php index 73ae2ade..a1564e64 100755 --- a/application/language/turkish/translations_lang.php +++ b/application/language/turkish/translations_lang.php @@ -170,6 +170,9 @@ $lang['company_link_hint'] = 'Şirket web sitesi, şirketin resmi web sitesine y $lang['go_to_booking_page'] = 'Rezervasyon Sayfasına Git'; $lang['settings_saved'] = 'Ayarlar başarıyla kaydedildi.'; $lang['general'] = 'Genel'; +$lang['client_form'] = 'Müşteri formu'; +$lang['visible'] = 'Gözle görülür'; +$lang['hidden'] = 'Gizli'; $lang['business_logic'] = 'İş Mantığı'; $lang['current_user'] = 'Mevcut Kullanıcı'; $lang['about_app'] = 'Easy!Appointments Hakkında'; diff --git a/application/migrations/022_add_show_fields_setting.php b/application/migrations/022_add_show_fields_setting.php new file mode 100644 index 00000000..03e393d7 --- /dev/null +++ b/application/migrations/022_add_show_fields_setting.php @@ -0,0 +1,65 @@ + + * @copyright Copyright (c) 2013 - 2020, Alex Tselegidis + * @license http://opensource.org/licenses/GPL-3.0 - GPLv3 + * @link http://easyappointments.org + * @since v1.4.2 + * ---------------------------------------------------------------------------- */ + +/** + * Class Migration_Add_show_fields_setting + * + * @property CI_DB_query_builder $db + * @property CI_DB_forge $dbforge + */ +class Migration_Add_show_fields_setting extends CI_Migration { + /** + * Upgrade method. + */ + public function up() + { + $this->db->insert('settings', [ + 'name' => 'show_phone_number', + 'value' => '1' + ]); + + $this->db->insert('settings', [ + 'name' => 'show_address', + 'value' => '1' + ]); + + $this->db->insert('settings', [ + 'name' => 'show_city', + 'value' => '1' + ]); + + $this->db->insert('settings', [ + 'name' => 'show_zip_code', + 'value' => '1' + ]); + + $this->db->insert('settings', [ + 'name' => 'show_notes', + 'value' => '1' + ]); + + + } + + /** + * Downgrade method. + */ + public function down() + { + $this->db->delete('settings', ['name' => 'show_phone_number']); + $this->db->delete('settings', ['name' => 'show_address']); + $this->db->delete('settings', ['name' => 'show_city']); + $this->db->delete('settings', ['name' => 'show_zip_code']); + $this->db->delete('settings', ['name' => 'show_notes']); + } +} diff --git a/application/views/appointments/book.php b/application/views/appointments/book.php index 772eaa82..7ab88663 100755 --- a/application/views/appointments/book.php +++ b/application/views/appointments/book.php @@ -268,6 +268,7 @@ +
+
+
+ +
+ +
+ +
+
diff --git a/application/views/backend/settings.php b/application/views/backend/settings.php index a3030408..942455c5 100755 --- a/application/views/backend/settings.php +++ b/application/views/backend/settings.php @@ -38,6 +38,11 @@ + +
  • + +
    • +
  • @@ -172,6 +177,70 @@ + + + + + + + + + + +
    +
    +
    + + + + + + + +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + +
    @@ -218,6 +287,8 @@
    + +
    diff --git a/assets/css/backend.css b/assets/css/backend.css index 41d319a1..a18d8f6c 100644 --- a/assets/css/backend.css +++ b/assets/css/backend.css @@ -280,6 +280,23 @@ body legend { margin: 5px; } +.form-sub-button { + width: auto; +} + +.form-sub-button img{ + margin-top: -.25rem; +} + +.hidden{ + visibility: hidden; + height: 0; +} + +.hide-toggle div{ + display: flex; +} + @media (min-width: 768px) { .backend-page .nav-pills li { width: auto; @@ -846,6 +863,10 @@ body .form-horizontal .controls { max-width: 1024px; } +#settings-page #client-form fieldset .wrapper { + max-width: 1024px; +} + #settings-page .working-plan-wrapper { max-width: 600px; } diff --git a/assets/img/eye-hidden.svg b/assets/img/eye-hidden.svg new file mode 100644 index 00000000..e69c69b1 --- /dev/null +++ b/assets/img/eye-hidden.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/img/eye.svg b/assets/img/eye.svg new file mode 100644 index 00000000..74fd7b3e --- /dev/null +++ b/assets/img/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/js/backend_settings.js b/assets/js/backend_settings.js index bcfe96ef..2e6092db 100644 --- a/assets/js/backend_settings.js +++ b/assets/js/backend_settings.js @@ -101,6 +101,26 @@ window.BackendSettings = window.BackendSettings || {}; if (setting.name === 'privacy_policy_content') { $('#privacy-policy-content').trumbowyg('html', setting.value); } + + if (setting.name === 'show_phone_number' && setting.value === "1") { + $('#show-phone-number').find("div").toggleClass("hidden"); + } + + if (setting.name === 'show_address' && setting.value === "1") { + $('#show-address').find("div").toggleClass("hidden"); + } + + if (setting.name === 'show_city' && setting.value === "1") { + $('#show-city').find("div").toggleClass("hidden"); + } + + if (setting.name === 'show_zip_code' && setting.value === "1") { + $('#show-zip-code').find("div").toggleClass("hidden"); + } + + if (setting.name === 'show_notes' && setting.value === "1") { + $('#show-notes').find("div").toggleClass("hidden"); + } }); exports.wp = new WorkingPlan(); @@ -187,6 +207,63 @@ window.BackendSettings = window.BackendSettings || {}; settings.save(data); }); + /** + * Event: Visible/Hidden button "Click" + * + * Change the state of the Visible/Hidden button + */ + $('.hide-toggle').on('click', function () { + var $input = $(this); + $input.find("div").toggleClass("hidden"); + }); + + /** + * set a Visible/Hidden toggle button to a certain state + * + * @argument $element for which jquery element to set the state for + * @argument isVisible a boolean which is true if the button should display 'visible' and false when the button should display 'hidden' + * + */ + function setShowToggleValue($element, isVisible){ + if (getShowToggleValue($element) !== isVisible){ + $element.find("div").toggleClass("hidden"); + } + } + + /** + * get the Visible/Hidden toggle button + * + * @argument $element for which jquery element to set the state for + * + * @return the state of the button. True for visible, false for hidden. + */ + function getShowToggleValue($element){ + var visiblePartArray = $element.find(".hide-toggle-visible"); + return !visiblePartArray.hasClass("hidden"); + } + + /** + * Event: require phone number switch "Click" + * + * make sure that our phone number is visible when it is required. + */ + $('#show-phone-number').on('click', function () { + if (!getShowToggleValue($(this))){//if button is set to hidden + $('#require-phone-number').prop('checked', false); + } + }); + + /** + * Event: require phone number switch "Click" + * + * make sure that our phone number is visible when it is required. + */ + $('#require-phone-number').on('click', function () { + if ($(this).prop('checked')){ + setShowToggleValue($('#show-phone-number'), true); + } + }); + /** * Event: Username "Focusout" * diff --git a/assets/js/backend_settings_system.js b/assets/js/backend_settings_system.js index afdad951..7dd6e791 100644 --- a/assets/js/backend_settings_system.js +++ b/assets/js/backend_settings_system.js @@ -67,6 +67,29 @@ }); }; + /** + * Get the state of a visible/hidden toggle button + * + * This method uses the DOM elements of the backend/settings page, so it can't be used in another page. + * + * @argument the element jquery of a button object that is a visible/hidden toggle. + * + * @return '0' when the button shows 'invisible' and '1' when the button shows 'visible'. Will always return '0' on an error. + */ + function getToggleButtonState($element) { + var visiblePartArray = $element.find(".hide-toggle-visible"); + var invisiblePartArray = $element.find(".hide-toggle-hidden"); + if (!(visiblePartArray.length === 0 || invisiblePartArray.length === 0)) { + if (visiblePartArray.hasClass("hidden")){//our button is currently invisible + return '0';//invisible + }else{//our button is currently visible + return '1';//visible + } + }else{ + return '0';//invisible + } + } + /** * Prepare the system settings array. * @@ -106,6 +129,33 @@ value: $('#display-any-provider').prop('checked') ? '1' : '0' }); + //Client Form Tab + + settings.push({ + name: 'show_phone_number', + value: getToggleButtonState($('#show-phone-number')) + }); + + settings.push({ + name: 'show_address', + value: getToggleButtonState($('#show-address')) + }); + + settings.push({ + name: 'show_city', + value: getToggleButtonState($('#show-city')) + }); + + settings.push({ + name: 'show_zip_code', + value: getToggleButtonState($('#show-zip-code')) + }); + + settings.push({ + name: 'show_notes', + value: getToggleButtonState($('#show-notes')) + }); + // Business Logic Tab