@@ -298,7 +298,7 @@ def iterate_orders(self, form_data: dict):
298298
299299 qs = self ._date_filter (qs , form_data , rel = '' )
300300
301- if form_data [ 'paid_only' ] :
301+ if form_data . get ( 'paid_only' , True ) :
302302 qs = qs .filter (status = Order .STATUS_PAID )
303303 tax_rates = self ._get_all_tax_rates (qs )
304304
@@ -529,7 +529,7 @@ def iterate_fees(self, form_data: dict):
529529 )
530530 .select_related ('order' , 'order__invoice_address' , 'tax_rule' )
531531 )
532- if form_data [ 'paid_only' ] :
532+ if form_data . get ( 'paid_only' , True ) :
533533 qs = qs .filter (order__status = Order .STATUS_PAID )
534534
535535 qs = self ._date_filter (qs , form_data , rel = 'order__' )
@@ -645,14 +645,14 @@ def iterate_positions(self, form_data: dict):
645645 .select_related (
646646 'order' ,
647647 'order__invoice_address' ,
648- 'item ' ,
648+ 'product ' ,
649649 'variation' ,
650650 'voucher' ,
651651 'tax_rule' ,
652652 )
653653 .prefetch_related ('answers' , 'answers__question' , 'answers__options' )
654654 )
655- if form_data [ 'paid_only' ] :
655+ if form_data . get ( 'paid_only' , True ) :
656656 qs = qs .filter (order__status = Order .STATUS_PAID )
657657
658658 qs = self ._date_filter (qs , form_data , rel = 'order__' )
@@ -709,7 +709,7 @@ def iterate_positions(self, form_data: dict):
709709 for q in questions :
710710 if q .type == Question .TYPE_CHOICE_MULTIPLE :
711711 options [q .pk ] = []
712- if form_data [ 'group_multiple_choice' ] :
712+ if form_data . get ( 'group_multiple_choice' , False ) :
713713 for o in q .options .all ():
714714 options [q .pk ].append (o )
715715 headers .append (str (q .question ))
@@ -781,7 +781,7 @@ def iterate_positions(self, form_data: dict):
781781 row .append ('' )
782782 row .append ('' )
783783 row += [
784- str (op .item ),
784+ str (op .product ),
785785 str (op .variation ) if op .variation else '' ,
786786 op .price ,
787787 op .tax_rate ,
@@ -828,7 +828,7 @@ def iterate_positions(self, form_data: dict):
828828 acache [a .question_id ] = str (a )
829829 for q in questions :
830830 if q .type == Question .TYPE_CHOICE_MULTIPLE :
831- if form_data [ 'group_multiple_choice' ] :
831+ if form_data . get ( 'group_multiple_choice' , False ) :
832832 row .append (
833833 ', ' .join (str (o .answer ) for o in options [q .pk ] if o .pk in acache .get (q .pk , set ()))
834834 )
0 commit comments