resolved conflicts

resources/views/layouts/template.blade.php

@@ -201,10 +201,6 @@
                             <a class="dropdown-item" href="{{ route('practice-management.rpm-matrix-admin') }}">RPM (Admin)</a>
                             <a class="dropdown-item" href="{{ route('practice-management.daily-treatment-services') }}">Daily Treatment Services</a>
                             <a class="dropdown-item" href="{{ route('practice-management.client-pro-changes') }}">Client Pro Changes</a>
-<<<<<<< HEAD
-                            {{--<a class="dropdown-item" href="{{ route('practice-management.previousBills') }}">Previous Bills</a>--}}
-=======
->>>>>>> 3f606ec4f60894fc95cc55db3f549be1d2b3f42c
                             <a class="dropdown-item" href="{{ route('invoice-center.companies') }}">Invoice Center</a>
                             <a class="dropdown-item" href="{{ route('practice-management.financialTransactions') }}">Financial Transactions</a>
                             <a class="dropdown-item" href="/practice-management/bills/not-yet-signed">Pending Bills to Sign</a>
@@ -213,10 +209,6 @@
                             <a class="dropdown-item" href="{{ route('unmapped-sms') }}">Unmapped SMS</a>
                             <a class="dropdown-item" href="{{ route('practice-management.proAvailability') }}">Pro Availability</a>
                             <a class="dropdown-item" href="{{ route('practice-management.proCalendar') }}">Pro Calendar</a>
-<<<<<<< HEAD
-
-=======
->>>>>>> 3f606ec4f60894fc95cc55db3f549be1d2b3f42c
                             <a class="dropdown-item" href="{{ route('practice-management.billing-report') }}">Billing Report</a>
                             <a class="dropdown-item" href="{{ route('practice-management.processingBillMatrix') }}">Processing Bills</a>
                             <a class="dropdown-item" href="{{ route('practice-management.processingBillMatrix2') }}">Processing Bills (RPM)</a>
@@ -252,13 +244,6 @@
                             <a class="dropdown-item" href="{{ route('practice-management.remoteMonitoringReport') }}">Remote Monitoring Report</a>
                             <a class="dropdown-item" href="{{ route('practice-management.billingManager') }}">Billing Manager</a>
                             <a class="dropdown-item" href="{{ route('practice-management.cellularMeasurements') }}">Cellular Measurements</a>
-<<<<<<< HEAD
-                            <a class="dropdown-item" href="{{ route('practice-management.process-claims') }}">Process Claims</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.client-ccm-rm-status') }}">Client RM Status</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.hcp-note-activity') }}">HCP Note Activity</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.allNotes') }}">All Notes</a>
-
-=======
                             <a class="dropdown-item" href="{{ route('practice-management.cellularDeviceManager') }}">Cellular Device Manager</a>
                             <a class="dropdown-item" href="{{ route('practice-management.medicarePartBClaims') }}">Medicare Part B Claims</a>
                             <a class="dropdown-item" href="{{ route('practice-management.patientClaimSummary') }}">Patient Claim Summary</a>
@@ -267,29 +252,10 @@
                             <a class="dropdown-item" href="{{ route('practice-management.notes-processing-center') }}">Notes Processing Center</a>
                             <a class="dropdown-item" href="{{ route('practice-management.client-ccm-rm-status') }}">Client RM Status</a>
                             <a class="dropdown-item" href="{{ route('practice-management.rmActionReport') }}">RM Action Report</a>
->>>>>>> 3f606ec4f60894fc95cc55db3f549be1d2b3f42c
                             @if($pro->id == '1' || $pro->id == '16')
                                 <a class="dropdown-item" href="{{ route('practice-management.treatmentServiceUtil') }}">Treatment Service Util.</a>
                             @endif
                             <a class="dropdown-item" href="{{ route('practice-management.tickets') }}">Tickets</a>
-<<<<<<< HEAD
-                            <a class="dropdown-item" href="{{ route('practice-management.supply-orders') }}">Supply Orders</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.shipments') }}">Shipments</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.handouts') }}">Handouts</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.generic-bills') }}">Admin. Bills</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.clauses.list') }}">Clauses</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.statTrees.list') }}">Stat Trees</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.statTreeLineReports.reports') }}">Stat Trees Line Reports</a>
-
-                            <a class="dropdown-item" href="/practice-management/rates/all">Payment Rates</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.patientsAccountsInvites') }}">Patients Accounts Invites</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.memos') }}">Memos</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.segmentTemplates') }}">Segment Templates</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.visitTemplates') }}">Visit Templates</a>
-                            <a class="dropdown-item" href="{{ route('admin.bdt_devices') }}">BDT Devices</a>
-                            <a class="dropdown-item" href="{{ route('admin.patientsMissingDefasultSettings') }}">Patients Missing Default Settings</a>
-
-=======
                             <a class="dropdown-item" href="{{ route('practice-management.packs-multi-print') }}">Print Pack Labels</a>
                             <a class="dropdown-item" href="{{ route('practice-management.handouts') }}">Handouts</a>
                             <a class="dropdown-item" href="{{ route('practice-management.mc-code-checks') }}">MC Code Checks</a>
@@ -298,7 +264,6 @@
                             <a class="dropdown-item" href="{{ route('practice-management.statTreeLineReports.reports') }}">Stat Trees Line Reports</a>
                             <a class="dropdown-item" href="{{ route('practice-management.clientsBdtDevices') }}">Clients BDT Devices</a>
                             <a class="dropdown-item" href="{{ route('admin.part_b_patients') }}">Part B Patients</a>
->>>>>>> 3f606ec4f60894fc95cc55db3f549be1d2b3f42c
                         </div>
                     </li>
                 @endif

spec/rpt-queries.sql

@@ -132,3 +132,8 @@ WHERE days_between_most_recent_mcp_note_date_and_end_of_care_month IS NULL AND m
 UPDATE care_month SET most_recent_mcp_note_date = (SELECT effective_dateest FROM note WHERE note.client_id = care_month.client_id AND is_signed_by_hcp IS TRUE AND is_cancelled IS NOT TRUE AND effective_dateest <  ((date_trunc('month', start_date) + interval '1 month' - interval '1 day')::date) ORDER BY effective_dateest DESC LIMIT 1)
 WHERE most_recent_mcp_note_date IS NULL;
 
+
+UPDATE bill SET effective_date = (SELECT (date_trunc('month', care_month.start_date) + interval '1 month' - interval '1 day')::DATE FROM care_month WHERE bill.care_month_id = care_month.id)
+WHERE bill.care_month_id IS NOT NULL and bill.effective_date IS NULL;
+
+UPDATE bill SET effective_date = (SELECT effective_dateest FROM note WHERE bill.note_id = note.id) WHERE bill.note_id IS NOT NULL AND bill.effective_date IS NULL;