Merge branch 'master' into dev-vj

resources/views/app/patient/canvas-sections/rx/summary.php

@@ -8,6 +8,7 @@ $contentData = [];
 
 if($page){
     $contentData = json_decode($page->data, true);
+   
 }else{
     if ($patient->canvas_data) {
         $canvasData = json_decode($patient->canvas_data, true);
@@ -17,6 +18,8 @@ if($page){
     }
 }
 
+if(!isset($contentData['items'])) $contentData['items'] = [];
+
 if(count($contentData['items'])) {
     for ($i = 0; $i < count($contentData['items']); $i++) {
         $item = $contentData['items'][$i];