Merge pull request #35 from usermicrodevices/develop

add doc cash api

Author: usermicrodevices

api/tests.py

@@ -5,8 +5,8 @@
 from django.contrib.auth import get_user_model
 #from django.contrib.auth.models import Group
 from django.contrib.auth.hashers import make_password
-from django.test import Client
 from django.utils import timezone as django_timezone
+from django.test import Client
 
 from html.parser import HTMLParser
 
@@ -80,3 +80,22 @@ def test_products(self):
         print('Request♥', response.request)
         print('Response♡', response, response.headers)
         print('DATA⋆', eval(json.loads(response.content)))
+
+    def test_docs(self):
+        print()
+        url = '/api/docs/'
+        print('⚽GET', url)
+        response = self.client.get(url, headers={'X-CSRFToken':self.csrfmiddlewaretoken})
+        self.assertEqual(response.status_code, 200)
+        print('Request♥', response.request)
+        print('Response♡', response, response.headers)
+        print('DATA⋆', eval(json.loads(response.content.decode('utf8').replace('null', 'None'))))
+        print()
+        url = '/api/doc/cash/'
+        data = json.dumps({'sum_final':1000, 'records':[{'product':1, 'count':10, 'price':45}, {'product':2, 'count':10, 'price':63}]})
+        print('⚽POST', url, data)
+        response = self.client.post(url, data, 'json', headers={'X-CSRFToken':self.csrfmiddlewaretoken})
+        self.assertEqual(response.status_code, 200)
+        print('Request♥', response.request)
+        print('Response♡', response, response.headers)
+        print('DATA⋆', json.loads(response.content))

api/urls.py

@@ -7,5 +7,8 @@
     path('login/', views.url_login),
     path('logout/', views.url_logout),
     path('products/', views.ProductsView.as_view()),
-    path('products/cash/', views.ProductsCashView.as_view(), name='cash')
+    path('products/cash/', views.ProductsCashView.as_view(), name='products-cash'),
+    path('docs/', views.DocsView.as_view()),
+    path('doc/id<int:pk>/', views.DocView.as_view()),
+    path('doc/cash/', views.DocCashAddView.as_view(), name='doc-cash')
 ]

api/views.py

@@ -2,6 +2,7 @@
 
 from django.http import JsonResponse
 from django.views import View
+from django.views.generic import ListView, DetailView
 from django.core.serializers import serialize#, JSONSerializer
 from django.core.serializers.json import DjangoJSONEncoder
 #from django.core.signing import Signer
@@ -10,11 +11,13 @@
 from django.views.decorators.csrf import csrf_exempt, csrf_protect, requires_csrf_token, ensure_csrf_cookie
 from django.utils.decorators import method_decorator
 from django.views.decorators.http import require_http_methods
+from django.core.paginator import Paginator
 from django.conf import settings
 from django.db.models import F
 
 from users.models import User
-from refs.models import Product
+from refs.models import DocType, Product
+from core.models import Doc, Record
 
 
 @csrf_exempt
@@ -68,15 +71,11 @@ def url_logout(request):
     return JsonResponse({'success':"You're logged out."})
 
 
-#import asyncio
 class ProductsView(View):
     queryset = Product.objects.all()
 
-    #@method_decorator([login_required, csrf_protect, requires_csrf_token, ensure_csrf_cookie])
-    #async def get(self, request, *args, **kwargs):
     @method_decorator([ensure_csrf_cookie])
     def get(self, request, *args, **kwargs):
-        #await asyncio.sleep(1)
         data = serialize('json', self.queryset, fields=('id', 'article', 'name', 'cost', 'price', 'barcodes', 'currency'))
         return JsonResponse(data, safe=False)
 
@@ -90,8 +89,83 @@ def get(self, request, *args, **kwargs):
         #qs = self.queryset.annotate(curr=F('currency__name')).prefetch_related('currency', 'barcodes').values('id', 'article', 'name', 'price', 'barcodes', 'curr')
         #json_data = json.dumps(list(qs), cls=DjangoJSONEncoder)
         #data = {it['id']:dict(filter(dflt, it.items())) for it in qs}
-        data = {}
+        data = []
         for it in self.queryset.prefetch_related('currency', 'barcodes', 'qrcodes', 'group', 'unit'):
-            data[it.id] = {'article':it.article, 'name':it.name, 'price':it.price, 'barcodes':list(it.barcodes.values_list('id', flat=True)), 'qrcodes':list(it.qrcodes.values_list('id', flat=True)), 'currency':it.currency.name, 'group':it.group.name, 'unit':it.unit.label}
+            data.append({'id':it.id, 'article':it.article, 'name':it.name, 'price':it.price, 'barcodes':list(it.barcodes.values_list('id', flat=True)), 'qrcodes':list(it.qrcodes.values_list('id', flat=True)), 'currency':it.currency.name if it.currency else '', 'grp':it.group.name if it.group else '', 'unit':it.unit.label if it.unit else ''})
         json_data = json.dumps(data, cls=DjangoJSONEncoder)
         return JsonResponse(json_data, safe=False)
+
+
+class DocView(DetailView):
+    context_object_name = 'doc'
+    queryset = Doc.objects.none()
+
+    @method_decorator([ensure_csrf_cookie])
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['doc_list'] = Doc.objects.all()
+        return context
+
+    @method_decorator([ensure_csrf_cookie])
+    def get(self, request, *args, **kwargs):
+        data = serialize('json', self.queryset, fields=('id', 'article', 'name', 'cost', 'price', 'barcodes', 'currency'))
+        return JsonResponse(data, safe=False)
+
+
+class DocCashAddView(DocView):
+    context_object_name = 'doc-cash'
+
+    @method_decorator([ensure_csrf_cookie])
+    def post(self, request, *args, **kwargs):
+        try:
+            data = json.loads(request.body)
+        except json.decoder.JSONDecodeError as e:
+            logging.error(e)
+            return JsonResponse({'result':f'error: {e}'}, status=400)
+        except Exception as e:
+            logging.error(e)
+            return JsonResponse({'result':f'error: {e}'}, status=500)
+        sum_final = data.get('sum_final', 0)
+        records = data.get('records', [])
+        if records and sum_final:
+            t, created = DocType.objects.get_or_create(alias='sale', defaults={'alias':'sale', 'name':'Sale'})
+            doc = Doc(type=t, author=request.user)
+            try:
+                doc.save()
+            except Exception as e:
+                logging.error(e)
+                return JsonResponse({'result':f'error: {e}'}, status=500)
+            else:
+                for r in records:
+                    try:
+                        p = Product.objects.get(pk=r['product'])
+                    except Exception as e:
+                        logging.error([r, e])
+                    else:
+                        record = Record(count=r['count'], cost=p.cost, price=r['price'], doc=doc, currency=p.currency, product=p)
+                        try:
+                            record.save()
+                        except Exception as e:
+                            logging.error([r, record, e])
+        return JsonResponse({'result':'success', 'doc':f'{doc.id}'})
+
+
+class DocsView(ListView):
+    paginate_by = 10
+    model = Doc
+    context_object_name = 'docs'
+    queryset = Doc.objects.all()
+
+    @method_decorator([ensure_csrf_cookie])
+    def get(self, request, *args, **kwargs):
+        if request.GET:
+            self.queryset = self.queryset.filter(**request.GET)
+        paginator = Paginator(self.queryset, self.paginate_by)
+        page_number = request.GET.get('page')
+        page_obj = paginator.get_page(page_number)
+        logging.debug(page_obj.object_list)
+        #data = {'page':page_number, 'docs':[self.queryset]}
+        #json_data = json.dumps(data, cls=DjangoJSONEncoder)
+        json_data = serialize('json', page_obj, fields=('id', 'created_at', 'registered_at', 'owner', 'contractor', 'type', 'tax', 'sale_point', 'sum_final', 'author'))
+        logging.debug(json_data)
+        return JsonResponse(json_data, safe=False)

locale/ru_RU/LC_MESSAGES/django.po

@@ -506,6 +506,9 @@ msgstr "Пользователи"
 msgid "load from XLS file"
 msgstr "загрузить из файла XLS"
 
+msgid "load from XLS file with check (slow)"
+msgstr "загрузить из файла XLS с проверкой (медленно)"
+
 msgid "export to XLS file"
 msgstr "экспорт в файл XLS"
 

refs/admin.py

@@ -698,7 +698,7 @@ class ProductAdmin(CustomModelAdmin):
     list_select_related = ('tax', 'model', 'group')
     list_filter = (ProductGroupFilter, ProductManufacturerFilter, ProductModelFilter, TaxFilter)
     autocomplete_fields = ('tax', 'model', 'group', 'barcodes', 'qrcodes')
-    actions = ('from_xls', 'to_xls', 'price_to_xls', 'barcode_to_svg', 'fix_barcodes', 'reset_cached')
+    actions = ('from_xls_with_check', 'from_xls', 'to_xls', 'price_to_xls', 'barcode_to_svg', 'fix_barcodes', 'reset_cached')
 
     #class Media:
         #js = ['admin/js/autocomplete.js', 'admin/js/vendor/select2/select2.full.js']
@@ -859,6 +859,122 @@ def reset_cached(self, request, queryset, **kwargs):
         self.__objs__ = {}
     reset_cached.short_description = f'↻💦{_("reset cached values")}'
 
+    def from_xls_with_check(self, request, queryset, **kwargs):
+        from barcode import EAN13
+        from transliterate import slugify
+        from openpyxl import load_workbook
+        form = None
+        if 'apply' in request.POST:
+            self.logi('💡', request.FILES)
+            form = UploadFileForm(request.POST, request.FILES)
+            if form.is_valid():
+                msg_err = ''
+                count_created = 0
+                file = form.cleaned_data['file']
+                if file:
+                    units, groups, doc_income = {}, {}, None
+                    timestamp = int(time.time())
+                    wb = load_workbook(file)
+                    for sheetname in wb.sheetnames:
+                        self.logi('💡SHEET NAME', sheetname)
+                        ws = wb[sheetname]
+                        list_rows = list(ws.rows)
+                        prefix_cells = list_rows[0]
+                        self.logi(prefix_cells)
+                        row_index = 0
+                        for row in list_rows[1:]:
+                            if msg_err and msg_err[-1] != '\n':
+                                msg_err += '\n'
+                            row_index += 1
+                            v = list(row)
+                            try:
+                                p_group, p_code, p_name, p_article, p_unit, p_price, p_cost, p_barcode, p_count = [i.value for i in v]
+                            except Exception as e:
+                                self.loge(e)
+                                msg_err += f'ROW {row_index}: {e}'
+                            else:
+                                if Product.objects.filter(article=p_article).exists():
+                                    self.logi('PRODUCT', p_article, p_name, 'EXISTS')
+                                else:
+                                    product_kwargs = {'article':p_article if p_article else f'{timestamp+row_index}', 'name':p_name, 'cost':p_cost if isinstance(p_cost, (int, float)) else 0, 'price':p_price if isinstance(p_price, (int, float)) else 0}
+                                    if p_unit:
+                                        if p_unit not in units:
+                                            condition_unit = Q(label=p_unit) | Q(label__icontains=p_unit)
+                                            condition_unit |= Q(name=p_unit) | Q(name__icontains=p_unit)
+                                            unit = Unit.objects.filter(condition_unit).first()
+                                            if not unit:
+                                                unit = Unit(label=p_unit, name=p_unit)
+                                                try:
+                                                    unit.save()
+                                                except Exception as e:
+                                                    self.loge(e)
+                                                    unit = None
+                                            if unit:
+                                                units[p_unit] = unit
+                                        if p_unit not in units:
+                                            product_kwargs['unit'] = units[p_unit]
+                                    if p_group:
+                                        if p_group not in groups:
+                                            groups[p_group], created_group = ProductGroup.objects.get_or_create(name__icontains=p_group, defaults={'name':p_group})
+                                        product_kwargs['group'] = groups[p_group]
+                                    p = Product(**product_kwargs)
+                                    try:
+                                        p.save()
+                                    except Exception as e:
+                                        self.loge(e)
+                                        msg_err += f'; {e}'
+                                        continue
+                                    count_created += 1
+                                    time.sleep(.01)#FOR STRONG NEXT EAN13 GENERATION
+                                    barcode = f'{p_barcode}' if p_barcode is not None else EAN13(f'{round(time.time()*1000)}').ean
+                                    if barcode:
+                                        b, created = BarCode.objects.get_or_create(id=barcode)
+                                        if b:
+                                            p.barcodes.add(b)
+                                    if p_count:
+                                        if not doc_income:
+                                            t, created = DocType.objects.get_or_create(alias='balance', defaults={'alias':'balance', 'name':'Balance'})
+                                            doc_income = get_model('core.Doc')(type=t, author=request.user)
+                                            try:
+                                                doc_income.save()
+                                            except Exception as e:
+                                                self.loge(e)
+                                                msg_err += f'; {e}'
+                                        if doc_income:
+                                            r = get_model('core.Record')(count=p_count, cost=p.cost, price=p.price, doc=doc_income, product=p)
+                                            try:
+                                                r.save()
+                                            except Exception as e:
+                                                self.loge(e)
+                                                msg_err += f'; {e}'
+                                            else:
+                                                try:
+                                                    get_model('core.Register')(rec=r).save()
+                                                except Exception as e:
+                                                    self.loge(e)
+                                                    msg_err += f'; {e}'
+                self.message_user(request, f'🆗 {file.name} ✏️ FILE SIZE={file.size} ✏️ CREATED={count_created}; {msg_err}', messages.SUCCESS)
+                return HttpResponseRedirect(request.get_full_path())
+        if not form:
+            form = UploadFileForm(initial={'_selected_action': request.POST.getlist(admin.helpers.ACTION_CHECKBOX_NAME)})
+        m = queryset.model._meta
+        context = {}
+        context['items'] = []
+        context['form'] = form
+        context['title'] = _('File')
+        context['current_action'] = sys._getframe().f_code.co_name
+        context['subtitle'] = 'admin_select_file_form'
+        context['site_title'] = queryset.model._meta.verbose_name
+        context['is_popup'] = True
+        context['is_nav_sidebar_enabled'] = True
+        context['site_header'] = _('Admin panel')
+        context['has_permission'] = True
+        context['site_url'] = reverse('admin:{}_{}_changelist'.format(m.app_label, m.model_name))
+        context['available_apps'] = (m.app_label,)
+        context['app_label'] = m.app_label
+        return render(request, 'admin_select_file_form.html', context)
+    from_xls_with_check.short_description = f'📍⚔📉{_("load from XLS file with check (slow)")}📈'
+
     def from_xls(self, request, queryset, **kwargs):
         from barcode import EAN13
         from transliterate import slugify