Commit 7a062998 authored by Lucas Nunes's avatar Lucas Nunes

fix

parent c8472c94
......@@ -3,7 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="853286ae-8652-453d-8e83-ab776ad9c7ae" name="Default" comment="fix">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/app.php" beforeDir="false" afterPath="$PROJECT_DIR$/config/app.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/views/backend/settings/general.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/resources/views/backend/settings/general.blade.php" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -269,7 +269,7 @@
<workItem from="1567743881913" duration="190000" />
<workItem from="1567832429427" duration="62000" />
<workItem from="1579682757164" duration="8495000" />
<workItem from="1579740326050" duration="36380000" />
<workItem from="1579740326050" duration="37194000" />
</task>
<task id="LOCAL-00001" summary="fix">
<created>1579690799404</created>
......@@ -334,7 +334,14 @@
<option name="project" value="LOCAL" />
<updated>1580092253237</updated>
</task>
<option name="localTasksCounter" value="10" />
<task id="LOCAL-00010" summary="fix">
<created>1580094751406</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1580094751406</updated>
</task>
<option name="localTasksCounter" value="11" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
......@@ -345,10 +352,10 @@
<option name="LAST_COMMIT_MESSAGE" value="fix" />
</component>
<component name="WindowStateProjectService">
<state x="1975" y="104" key="CommitChangelistDialog2" timestamp="1580092252425">
<state x="1975" y="104" key="CommitChangelistDialog2" timestamp="1580094750766">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="1975" y="104" key="CommitChangelistDialog2/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580092252425" />
<state x="1975" y="104" key="CommitChangelistDialog2/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580094750766" />
<state x="2150" y="433" key="NewPhpFileDialog" timestamp="1580087547127">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
......@@ -357,10 +364,10 @@
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="2148" y="220" key="RollbackChangesDialog/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580073294419" />
<state x="1925" y="243" key="Vcs.Push.Dialog.v2" timestamp="1580092258741">
<state x="1925" y="243" key="Vcs.Push.Dialog.v2" timestamp="1580094754675">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
<state x="1925" y="243" key="Vcs.Push.Dialog.v2/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580092258741" />
<state x="1925" y="243" key="Vcs.Push.Dialog.v2/1366.0.1920.1080/0.0.1366.768@1366.0.1920.1080" timestamp="1580094754675" />
<state x="2102" y="244" key="VcsDiffUtil.ChangesDialog" timestamp="1579686223702">
<screen x="1366" y="0" width="1920" height="1080" />
</state>
......
......@@ -95,11 +95,12 @@
{{-- {{ __('labels.backend.general_settings.email.title') }}--}}
{{-- </a>--}}
{{-- </li>--}}
{{-- <li class="nav-item">--}}
{{-- <a data-toggle="tab" class="nav-link" href="#payment_settings">--}}
{{-- {{ __('labels.backend.general_settings.payment_settings.title') }}--}}
{{-- </a>--}}
{{-- </li>--}}
<li class="nav-item">
<a data-toggle="tab" class="nav-link" href="#payment_settings">
{{ __('labels.backend.general_settings.payment_settings.title') }}
</a>
</li>
{{-- <li class="nav-item">--}}
{{-- <a data-toggle="tab" class="nav-link" href="#language_settings">--}}
{{-- {{ __('labels.backend.general_settings.language_settings.title') }}--}}
......@@ -662,7 +663,7 @@
<div id="payment_settings" class="tab-pane container fade">
<div class="row mt-4 mb-4">
<div class="col">
<div class="form-group row">
{{--<div class="form-group row">
{{ html()->label(__('labels.backend.general_settings.payment_settings.select_currency'))->class('col-md-3 form-control-label')}}
<div class="col-md-9">
<select class="form-control" id="app__currency" name="app__currency">
......@@ -674,8 +675,8 @@
@endforeach
</select>
</div>
</div>
<div class="form-group row">
</div>--}}
{{--<div class="form-group row">
{{ html()->label(__('labels.backend.general_settings.payment_settings.stripe'))->class('col-md-3 form-control-label')->for('services.stripe.active') }}
<div class="col-md-9">
<div class="checkbox">
......@@ -767,7 +768,7 @@
</div><!--form-group-->
</div>
</div><!--col-->
</div><!--form-group-->
</div><!--form-group-->--}}
<div class="form-group row">
{{ html()->label(__('labels.backend.general_settings.payment_settings.offline_mode'))->class('col-md-3 form-control-label')}}
<div class="col-md-9">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment