diff --git a/addons/default/visiosoft/default-theme/resources/views/partials/assets.twig b/addons/default/visiosoft/default-theme/resources/views/partials/assets.twig index e670d3698..fee88c04d 100644 --- a/addons/default/visiosoft/default-theme/resources/views/partials/assets.twig +++ b/addons/default/visiosoft/default-theme/resources/views/partials/assets.twig @@ -31,7 +31,7 @@ {% for style in asset_styles("styles.css") %} {{ style|raw }} {% endfor %} -{{ asset_style("theme::css/default/animate") }} +{{ asset_style("theme::css/default/animate.css") }} {{ asset_add("visiosoft_default.js", "theme::js/default/*") }} {{ asset_script("visiosoft_default.js") }} {{ asset_add("visiosoft_default_custom.js", "theme::js/zcustom.js") }} diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/profile-dock.twig b/addons/default/visiosoft/profile-module/resources/views/profile/profile-dock.twig index 2d0996e99..8d78b7af9 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/profile-dock.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/profile-dock.twig @@ -77,7 +77,7 @@ {% if entries('advs').isEnabled('subscriptions') %}
  • - {{ trans('visiosoft.module.profile::field.subscriptions.name') }} + {{ trans('visiosoft.module.profile::field.subscriptions.name') }}
    • {% endif %} diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/subscriptions.twig b/addons/default/visiosoft/profile-module/resources/views/profile/subscriptions.twig deleted file mode 100644 index 83fd03cf4..000000000 --- a/addons/default/visiosoft/profile-module/resources/views/profile/subscriptions.twig +++ /dev/null @@ -1,149 +0,0 @@ -{% extends "theme::layouts/default" %} -{% block content %} -
    -
    -
    - -
      -
    1. - {{ trans("visiosoft.module.profile::field.menu_profile.name") }} -
      2. -
    2. {{ trans('visiosoft.module.profile::field.subscriptions.name') }}
      3. -
    -

    {{ trans('visiosoft.module.profile::field.subscriptions.name') }}

    -
    -
    -
    -
    - {% include "theme::partials/messages" %} -
    -
    -
    - - -
    - -
    -
    - -
    -
    - -
    -
    - {% if count(entries('advs').userSubscriptions()) != 0 %} -

    - - - {{ trans('visiosoft.module.subscriptions::message.input_info_subdomain.message') }}www.******.com ( www.{{ trans('visiosoft.module.profile::field.sitename.name') }}.com ) - -

    - {% set sites_form = form('sites').get() %} - {{ form_open({ - 'class': 'form ' ~ sites_form.options.class , - 'enctype': 'multipart/form-data', - 'url': 'cloudsite/sites/create' - })|raw }} - {{ sites_form.fields.subdomain|raw }} - {{ sites_form.actions|raw }} - {{ sites_form.close|raw }} - - - - - - - - - - - - {% for key,site in mysites %} - - - - - - - {% endfor %} - -
    #{{ trans('visiosoft.module.subscriptions::field.subdomain.name') }}{{ trans('visiosoft.module.subscriptions::field.plan.basic') }}{{ trans('visiosoft.module.subscriptions::field.actions.name') }}
    {{ key+1 }} - -

    {{ site.subdomain }}.openclassify.com -

    -     		- {{ site.getPlan(plan_id).name }} - - {{ trans('visiosoft.module.subscriptions::field.delete.name') }} -
    - {% else %} -
    - - {{ trans('visiosoft.module.cloudsite::message.buy_subscription_warning.message') }} - {{ trans('visiosoft.module.profile::field.go_subscriptions_page.name') }} -
    - - {% endif %} -
    - -
    - - - - - - - - - - - {% for key,plan in plans %} - - - - {% set time = date(plan.ends_at).diff(date(plan.starts_at|date)) %} - - {% set trial = date(plan.trial_ends_at).diff(date(plan.starts_at|date)) %} - - - {% endfor %} - -
    #{{ trans('visiosoft.module.subscriptions::field.plan.subject') }}{{ trans('visiosoft.module.subscriptions::field.remaining_time.name') }}{{ trans('visiosoft.module.subscriptions::field.trial_time.name') }}
    {{ key+1 }}{{ plan.name }}{{ time.days }} {{ trans('visiosoft.module.subscriptions::field.days.name') }}{{ trial.days }} {{ trans('visiosoft.module.subscriptions::field.days.name') }}
    -
    -
    -
    -
    - -
    - -
    -
    - {% include "visiosoft.module.profile::profile/dock-right" %} -
    - {{ form.close|raw }} -
    -
    -
    - {{ asset_add("scripts.js", "visiosoft.module.profile::assets/js/profile.js") }} -{% endblock %} - - diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php index 10b224d39..d5bfca8dc 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php @@ -462,23 +462,4 @@ class MyProfileController extends PublicController } - public function subscription() - { - $isActive = new AdvModel(); - $isActiveSubscriptions = $isActive->is_enabled('subscriptions'); - if ($isActiveSubscriptions) { - $siteModel = new SiteModel(); - $mysites = $siteModel->getMySites(); - - - $plans = PlanSubscription::query() - ->where('user_id', Auth::id()) - ->leftJoin('plans as p1', 'plan_subscriptions.user_id', '=', 'p1.id') - ->select('p1.name as pname', 'plan_subscriptions.*') - ->orderByDesc('plan_subscriptions.id') - ->get(); - } - return $this->view->make('visiosoft.module.profile::profile.subscriptions',compact('mysites', 'plans')); - } - } diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php index 95f157b14..0c132d29d 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php @@ -70,7 +70,6 @@ class ProfileModuleServiceProvider extends AddonServiceProvider 'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@adressEdit' ], 'profile/adress/update/{id}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@adressUpdate', - 'profile/subscription' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@subscription', 'profile/class/status/{id},{type}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@statusAds', 'profile/class/extendTime/{id},{type}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@extendAds', 'profile/message/show/{id}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@showMessage',