Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:fairmondo/fairmondo into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
andreasknoepfle committed Mar 11, 2015
2 parents 2f1df46 + 7824332 commit 3795310
Showing 1 changed file with 2 additions and 17 deletions.
19 changes: 2 additions & 17 deletions app/views/line_item_groups/shared/_listitem.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -11,26 +11,11 @@
.Lineitemgroup-actions>
- if line_item_group.buyer == current_user
span>= link_to t('line_item_group.texts.show_order_and_pay'), line_item_group_path(line_item_group), class: 'Button', data: { push: true }
span>= link_to t('line_item_group.texts.rate'),line_item_group_path(line_item_group, tab: 'rating'), class: 'Button', data: { push: true }
- unless line_item_group.rating.present?
span>= link_to t('line_item_group.texts.rate'),line_item_group_path(line_item_group, tab: 'rating'), class: 'Button', data: { push: true }
- else
= link_to t('line_item_group.texts.show_order'), line_item_group_path(line_item_group), class: 'Button', data: { push: true }

.Lineitemgroup-images
- line_item_group.business_transactions.map(&:article).each do |article|
= image_tag(article.title_image_url(:thumb), :title => article.title)


/p
/ .Listview
/ - line_item_group.business_transactions.each do |business_transaction|
/ = render layout: '/shared/listview/listitem', locals: { article: business_transaction.article} do
/ - if business_transaction && policy(Refund.new(business_transaction: business_transaction)).new?
/ = link_to t( 'refund.button' ), new_business_transaction_refund_path(business_transaction), :class => "Button"
/
/ - if line_item_group.seller == current_user
/ = link_to 'Auftrag ansehen', line_item_group_path(line_item_group), class: 'Button'
/
/ - if line_item_group.buyer == current_user
/ = link_to 'Bestellung ansehen und bezahlen', line_item_group_path(line_item_group), class: 'Button'
/ - if line_item_group.buyer == current_user && !line_item_group.rating
/ = link_to t('transaction.completed.rate'), line_item_group_new_user_rating_path(line_item_group.seller, line_item_group), class: 'Button'

0 comments on commit 3795310

Please sign in to comment.