Merge pull request #777 from openclassify/dia

#2558 e-madencilik message bug
This commit is contained in:
spektra2147 2020-11-05 10:53:42 +03:00 committed by GitHub
commit 67afa803b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 3 deletions

View File

@ -56,5 +56,8 @@
</form> </form>
</div> </div>
</section> </section>
{{ addBlock('post-cat/section') }}
{{ asset_add("scripts.js", "visiosoft.module.advs::js/cats.js") }} {{ asset_add("scripts.js", "visiosoft.module.advs::js/cats.js") }}
{% endblock %} {% endblock %}

View File

@ -801,7 +801,13 @@ class AdvsController extends PublicController
} }
// Auto approve // Auto approve
if (setting_value('visiosoft.module.advs::auto_approve') && !$allowPendingAdCreation) { $autoApprove = true;
if ($allowPendingAdCreation) {
$adLogExists = app('Visiosoft\PackagesModule\AdvsLog\Contract\AdvsLogRepositoryInterface')
->findByAdID($adv->id);
$autoApprove = $adLogExists ? false : true;
}
if (setting_value('visiosoft.module.advs::auto_approve') && $autoApprove) {
$defaultAdPublishTime = setting_value('visiosoft.module.advs::default_published_time'); $defaultAdPublishTime = setting_value('visiosoft.module.advs::default_published_time');
$adv->update([ $adv->update([
'status' => 'approved', 'status' => 'approved',
@ -863,8 +869,12 @@ class AdvsController extends PublicController
if ($packageEnabled if ($packageEnabled
&& \request()->pack_id && \request()->pack_id
&& setting_value('visiosoft.module.packages::allow_pending_ad_creation')) { && setting_value('visiosoft.module.packages::allow_pending_ad_creation')) {
app('Visiosoft\PackagesModule\Http\Controller\PackageFEController') $package = app('Visiosoft\PackagesModule\Package\Contract\PackageRepositoryInterface')
->packageAddCart(\request()->pack_id, $new->id); ->find(\request()->pack_id);
if ($package->price) {
app('Visiosoft\PackagesModule\Http\Controller\PackageFEController')
->packageAddCart(\request()->pack_id, $new->id);
}
} }
return redirect('/advs/edit_advs/' . $new->id); return redirect('/advs/edit_advs/' . $new->id);