From 3e5891a5af02db9b48f9b6378e8dfdd5b4dfe69f Mon Sep 17 00:00:00 2001
From: root <merdan.m@gmail.com>
Date: Mon, 13 Feb 2023 21:15:38 +0500
Subject: [PATCH] from server

---
 .../controllers/api/postsController.php       |  4 ++--
 themes/modern2/layouts/new/master-inside.htm  |  4 +++-
 .../partials/new/latest-news-mobile.htm       | 19 ++++++++++++++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/plugins/ahmadfatoni/apigenerator/controllers/api/postsController.php b/plugins/ahmadfatoni/apigenerator/controllers/api/postsController.php
index 2b98cb509..a2b1b3309 100644
--- a/plugins/ahmadfatoni/apigenerator/controllers/api/postsController.php
+++ b/plugins/ahmadfatoni/apigenerator/controllers/api/postsController.php
@@ -34,7 +34,7 @@ class postsController extends Controller
             'typePost'             => input('typePost'),
             'postGroup'             => input('group'),
             'published'        => true,
-            'select'   => ['id','title','slug','published_at', 'more_photo','afisha_phone', 'afisha_address', DB::raw("IF(featured_image<>'',concat('$path',featured_image),featured_image) as main_image")]
+            'select'   => ['id','title','slug','published_at', 'more_photo','afisha_phone', 'afisha_address', 'afisha_phone_new', DB::raw("IF(featured_image<>'',concat('$path',featured_image),featured_image) as main_image")]
         ];
         
         if(request()->has('featured')){
@@ -55,7 +55,7 @@ class postsController extends Controller
     //posts item
     public function show($locale,$id){
 
-        $post = $this->Post::find($id,['id','content_html','author','slug', 'afisha_phone', 'afisha_address']);
+        $post = $this->Post::find($id,['id','content_html','author','slug', 'afisha_phone', 'afisha_address', 'afisha_phone_new',]);
 
         if(!is_null($post)) {
 
diff --git a/themes/modern2/layouts/new/master-inside.htm b/themes/modern2/layouts/new/master-inside.htm
index 9c3464e9e..71ec773f6 100644
--- a/themes/modern2/layouts/new/master-inside.htm
+++ b/themes/modern2/layouts/new/master-inside.htm
@@ -120,8 +120,10 @@ default = 0
   <script src="{{ 'assets/new/jquery.js'|theme}}"></script>
   <script src="{{ 'assets/new/scripts/swiper/swiper-bundle.min.js'|theme}}"></script>
     <script src="{{ 'assets/new/copy.js'|theme}}"></script>
+    
+    {% scripts %}
    {% framework extras %}
-  {% scripts %}
+  
 
  
   <!-- javascript end
diff --git a/themes/modern2/partials/new/latest-news-mobile.htm b/themes/modern2/partials/new/latest-news-mobile.htm
index 45af397aa..5b0da27c8 100644
--- a/themes/modern2/partials/new/latest-news-mobile.htm
+++ b/themes/modern2/partials/new/latest-news-mobile.htm
@@ -8,8 +8,24 @@ noPostsMessage = "No posts found"
 sortOrder = "created_at desc"
 categoryPage = 404
 postPage = 404
+
+[blogPosts blogPosts2]
+pageNumber = "{{ :page }}"
+typePost = "world"
+postsPerPage = 10
+noPostsMessage = "No posts found"
+sortOrder = "created_at desc"
+categoryPage = 404
+postPage = 404
+==
+<?php
+function onStart(){
+    $this["merged"]=$this["blogPosts"]."qq";
+}
+?>
 ==
 {% set posts = blogPosts.posts %}  
+{% set posts_world = blogPosts2.posts %}
 
 
   <!-- ASIDE MOBILE ============-->
@@ -20,11 +36,12 @@ postPage = 404
       <ul class="aside-mobile-items">
       
       {% for post in posts %}
-      
+          
         <li>
           <a href="{{'new/newPost'|page({id:post.id,slug:post.slug})}}">
             <div class="time">{{post.published_at|date('H:i')}}</div>
             <p class="content">
+            {{merged}}
               {{ post.title }}
             </p>
           </a>